summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_both.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/d1_both.c')
-rw-r--r--src/lib/libssl/d1_both.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/libssl/d1_both.c b/src/lib/libssl/d1_both.c
index f27588fcff..e25f69dbb6 100644
--- a/src/lib/libssl/d1_both.c
+++ b/src/lib/libssl/d1_both.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: d1_both.c,v 1.23 2014/07/10 08:25:00 guenther Exp $ */ 1/* $OpenBSD: d1_both.c,v 1.24 2014/07/10 08:51:14 tedu Exp $ */
2/* 2/*
3 * DTLS implementation written by Nagendra Modadugu 3 * DTLS implementation written by Nagendra Modadugu
4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -944,7 +944,6 @@ dtls1_send_finished(SSL *s, int a, int b, const char *sender, int slen)
944 * ssl->s3->read_sequence zero 944 * ssl->s3->read_sequence zero
945 * ssl->s3->read_mac_secret re-init 945 * ssl->s3->read_mac_secret re-init
946 * ssl->session->read_sym_enc assign 946 * ssl->session->read_sym_enc assign
947 * ssl->session->read_compression assign
948 * ssl->session->read_hash assign 947 * ssl->session->read_hash assign
949 */ 948 */
950int 949int
@@ -1160,7 +1159,6 @@ dtls1_buffer_message(SSL *s, int is_ccs)
1160 /* save current state*/ 1159 /* save current state*/
1161 frag->msg_header.saved_retransmit_state.enc_write_ctx = s->enc_write_ctx; 1160 frag->msg_header.saved_retransmit_state.enc_write_ctx = s->enc_write_ctx;
1162 frag->msg_header.saved_retransmit_state.write_hash = s->write_hash; 1161 frag->msg_header.saved_retransmit_state.write_hash = s->write_hash;
1163 frag->msg_header.saved_retransmit_state.compress = s->compress;
1164 frag->msg_header.saved_retransmit_state.session = s->session; 1162 frag->msg_header.saved_retransmit_state.session = s->session;
1165 frag->msg_header.saved_retransmit_state.epoch = s->d1->w_epoch; 1163 frag->msg_header.saved_retransmit_state.epoch = s->d1->w_epoch;
1166 1164
@@ -1229,7 +1227,6 @@ dtls1_retransmit_message(SSL *s, unsigned short seq, unsigned long frag_off,
1229 /* save current state */ 1227 /* save current state */
1230 saved_state.enc_write_ctx = s->enc_write_ctx; 1228 saved_state.enc_write_ctx = s->enc_write_ctx;
1231 saved_state.write_hash = s->write_hash; 1229 saved_state.write_hash = s->write_hash;
1232 saved_state.compress = s->compress;
1233 saved_state.session = s->session; 1230 saved_state.session = s->session;
1234 saved_state.epoch = s->d1->w_epoch; 1231 saved_state.epoch = s->d1->w_epoch;
1235 1232
@@ -1238,7 +1235,6 @@ dtls1_retransmit_message(SSL *s, unsigned short seq, unsigned long frag_off,
1238 /* restore state in which the message was originally sent */ 1235 /* restore state in which the message was originally sent */
1239 s->enc_write_ctx = frag->msg_header.saved_retransmit_state.enc_write_ctx; 1236 s->enc_write_ctx = frag->msg_header.saved_retransmit_state.enc_write_ctx;
1240 s->write_hash = frag->msg_header.saved_retransmit_state.write_hash; 1237 s->write_hash = frag->msg_header.saved_retransmit_state.write_hash;
1241 s->compress = frag->msg_header.saved_retransmit_state.compress;
1242 s->session = frag->msg_header.saved_retransmit_state.session; 1238 s->session = frag->msg_header.saved_retransmit_state.session;
1243 s->d1->w_epoch = frag->msg_header.saved_retransmit_state.epoch; 1239 s->d1->w_epoch = frag->msg_header.saved_retransmit_state.epoch;
1244 1240
@@ -1256,7 +1252,6 @@ dtls1_retransmit_message(SSL *s, unsigned short seq, unsigned long frag_off,
1256 /* restore current state */ 1252 /* restore current state */
1257 s->enc_write_ctx = saved_state.enc_write_ctx; 1253 s->enc_write_ctx = saved_state.enc_write_ctx;
1258 s->write_hash = saved_state.write_hash; 1254 s->write_hash = saved_state.write_hash;
1259 s->compress = saved_state.compress;
1260 s->session = saved_state.session; 1255 s->session = saved_state.session;
1261 s->d1->w_epoch = saved_state.epoch; 1256 s->d1->w_epoch = saved_state.epoch;
1262 1257