summaryrefslogtreecommitdiff
path: root/lib/libssl
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2020-08-11 19:21:55 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2020-08-11 19:21:55 +0000
commit16d54354609ab15527fca926d25d13f212db57be (patch)
tree3db823f4407815300ef9dc7abb7cd4942b215ab0 /lib/libssl
parentbf4dbdd82a5d792a9fdc963efade7ad92c326a84 (diff)
Increment the epoch in the same place for both read and write.
ok inoguchi@ tb@
Diffstat (limited to 'lib/libssl')
-rw-r--r--lib/libssl/d1_pkt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libssl/d1_pkt.c b/lib/libssl/d1_pkt.c
index 9ea694f605c..4a6b3b7dcf1 100644
--- a/lib/libssl/d1_pkt.c
+++ b/lib/libssl/d1_pkt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_pkt.c,v 1.79 2020/08/11 19:13:35 jsing Exp $ */
+/* $OpenBSD: d1_pkt.c,v 1.80 2020/08/11 19:21:54 jsing Exp $ */
/*
* DTLS implementation written by Nagendra Modadugu
* (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -1427,14 +1427,14 @@ dtls1_reset_seq_numbers(SSL *s, int rw)
unsigned int seq_bytes = sizeof(S3I(s)->read_sequence);
if (rw & SSL3_CC_READ) {
- seq = S3I(s)->read_sequence;
D1I(s)->r_epoch++;
+ seq = S3I(s)->read_sequence;
memcpy(&(D1I(s)->bitmap), &(D1I(s)->next_bitmap), sizeof(DTLS1_BITMAP));
memset(&(D1I(s)->next_bitmap), 0, sizeof(DTLS1_BITMAP));
} else {
+ D1I(s)->w_epoch++;
seq = S3I(s)->write_sequence;
memcpy(D1I(s)->last_write_sequence, seq, sizeof(S3I(s)->write_sequence));
- D1I(s)->w_epoch++;
}
memset(seq, 0, seq_bytes);