diff options
author | jsing <> | 2021-05-02 17:18:10 +0000 |
---|---|---|
committer | jsing <> | 2021-05-02 17:18:10 +0000 |
commit | 74ea211ec5e7b4700067e49d7703512760086ab8 (patch) | |
tree | 635d2be6e673bbc73bbd4e14d51b19d0a5a629a1 /src/lib/libssl/ssl_srvr.c | |
parent | fd4dbd5fe6f9115e21352ba8bf2af64733fefecd (diff) | |
download | openbsd-74ea211ec5e7b4700067e49d7703512760086ab8.tar.gz openbsd-74ea211ec5e7b4700067e49d7703512760086ab8.tar.bz2 openbsd-74ea211ec5e7b4700067e49d7703512760086ab8.zip |
Clean up dtls1_reset_seq_numbers().
Rather than doing flag gymnastics, split dtls1_reset_seq_numbers() into
separate read and write functions. Move the calls of these functions into
tls1_change_cipher_state() so they directly follow the change of cipher
state in the record layer, which avoids having to duplicate the calls in
the client and server.
ok inoguchi@ tb@
Diffstat (limited to 'src/lib/libssl/ssl_srvr.c')
-rw-r--r-- | src/lib/libssl/ssl_srvr.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c index 32ffa88f15..2d1af2f86f 100644 --- a/src/lib/libssl/ssl_srvr.c +++ b/src/lib/libssl/ssl_srvr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_srvr.c,v 1.105 2021/04/30 19:26:45 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_srvr.c,v 1.106 2021/05/02 17:18:10 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -659,9 +659,6 @@ ssl3_accept(SSL *s) | |||
659 | ret = -1; | 659 | ret = -1; |
660 | goto end; | 660 | goto end; |
661 | } | 661 | } |
662 | |||
663 | if (SSL_is_dtls(s)) | ||
664 | dtls1_reset_seq_numbers(s, SSL3_CC_WRITE); | ||
665 | break; | 662 | break; |
666 | 663 | ||
667 | case SSL3_ST_SW_FINISHED_A: | 664 | case SSL3_ST_SW_FINISHED_A: |