diff options
| author | Matt Caswell <matt@openssl.org> | 2015-02-03 15:14:24 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-03-26 15:02:00 +0000 |
| commit | 78a39fe735ef253bbf1d028a3e7934bda76f8276 (patch) | |
| tree | a0739ac251617a5e23754c5988ce48e189575dfc /ssl/d1_both.c | |
| parent | 40f37188a63c988c66bfece95280b67158998e64 (diff) | |
Move r_epoch and w_epoch from s->d1 to s->rlayer.d
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/d1_both.c')
| -rw-r--r-- | ssl/d1_both.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ssl/d1_both.c b/ssl/d1_both.c index 14e9c85b76..453c5f893e 100644 --- a/ssl/d1_both.c +++ b/ssl/d1_both.c @@ -1110,7 +1110,8 @@ int dtls1_buffer_message(SSL *s, int is_ccs) frag->msg_header.saved_retransmit_state.write_hash = s->write_hash; frag->msg_header.saved_retransmit_state.compress = s->compress; frag->msg_header.saved_retransmit_state.session = s->session; - frag->msg_header.saved_retransmit_state.epoch = s->d1->w_epoch; + frag->msg_header.saved_retransmit_state.epoch = + DTLS_RECORD_LAYER_get_w_epoch(&s->rlayer); memset(seq64be, 0, sizeof(seq64be)); seq64be[6] = @@ -1184,8 +1185,7 @@ dtls1_retransmit_message(SSL *s, unsigned short seq, unsigned long frag_off, saved_state.write_hash = s->write_hash; saved_state.compress = s->compress; saved_state.session = s->session; - saved_state.epoch = s->d1->w_epoch; - saved_state.epoch = s->d1->w_epoch; + saved_state.epoch = DTLS_RECORD_LAYER_get_w_epoch(&s->rlayer); s->d1->retransmitting = 1; @@ -1194,7 +1194,8 @@ dtls1_retransmit_message(SSL *s, unsigned short seq, unsigned long frag_off, s->write_hash = frag->msg_header.saved_retransmit_state.write_hash; s->compress = frag->msg_header.saved_retransmit_state.compress; s->session = frag->msg_header.saved_retransmit_state.session; - s->d1->w_epoch = frag->msg_header.saved_retransmit_state.epoch; + DTLS_RECORD_LAYER_set_w_epoch(&s->rlayer, + frag->msg_header.saved_retransmit_state.epoch); if (frag->msg_header.saved_retransmit_state.epoch == saved_state.epoch - 1) { @@ -1212,7 +1213,7 @@ dtls1_retransmit_message(SSL *s, unsigned short seq, unsigned long frag_off, s->write_hash = saved_state.write_hash; s->compress = saved_state.compress; s->session = saved_state.session; - s->d1->w_epoch = saved_state.epoch; + DTLS_RECORD_LAYER_set_w_epoch(&s->rlayer, saved_state.epoch); if (frag->msg_header.saved_retransmit_state.epoch == saved_state.epoch - 1) { |