diff options
author | jsing <> | 2021-01-26 14:22:20 +0000 |
---|---|---|
committer | jsing <> | 2021-01-26 14:22:20 +0000 |
commit | c1474fe27acff975d8a3948fb3b6b72d099ee9ce (patch) | |
tree | 693ea078ee47f323e868616964234ef9ea593794 /src/lib/libssl/ssl_lib.c | |
parent | 7602e79fb847dbe732cccb0b75a2591c2792d03e (diff) | |
download | openbsd-c1474fe27acff975d8a3948fb3b6b72d099ee9ce.tar.gz openbsd-c1474fe27acff975d8a3948fb3b6b72d099ee9ce.tar.bz2 openbsd-c1474fe27acff975d8a3948fb3b6b72d099ee9ce.zip |
Move sequence numbers into the new TLSv1.2 record layer.
This allows for all of the DTLS sequence number save/restore code to be
removed.
ok inoguchi@ "whee!" tb@
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 0537cf0e46..e0e0ae4ff1 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_lib.c,v 1.240 2021/01/09 10:34:29 tb Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.241 2021/01/26 14:22:19 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 | * |
@@ -2612,8 +2612,6 @@ ssl_clear_cipher_read_state(SSL *s) | |||
2612 | s->read_hash = NULL; | 2612 | s->read_hash = NULL; |
2613 | 2613 | ||
2614 | tls12_record_layer_clear_read_state(s->internal->rl); | 2614 | tls12_record_layer_clear_read_state(s->internal->rl); |
2615 | tls12_record_layer_set_read_seq_num(s->internal->rl, | ||
2616 | S3I(s)->read_sequence); | ||
2617 | 2615 | ||
2618 | if (s->internal->aead_read_ctx != NULL) { | 2616 | if (s->internal->aead_read_ctx != NULL) { |
2619 | EVP_AEAD_CTX_cleanup(&s->internal->aead_read_ctx->ctx); | 2617 | EVP_AEAD_CTX_cleanup(&s->internal->aead_read_ctx->ctx); |
@@ -2631,8 +2629,6 @@ ssl_clear_cipher_write_state(SSL *s) | |||
2631 | s->internal->write_hash = NULL; | 2629 | s->internal->write_hash = NULL; |
2632 | 2630 | ||
2633 | tls12_record_layer_clear_write_state(s->internal->rl); | 2631 | tls12_record_layer_clear_write_state(s->internal->rl); |
2634 | tls12_record_layer_set_write_seq_num(s->internal->rl, | ||
2635 | S3I(s)->write_sequence); | ||
2636 | 2632 | ||
2637 | if (s->internal->aead_write_ctx != NULL) { | 2633 | if (s->internal->aead_write_ctx != NULL) { |
2638 | EVP_AEAD_CTX_cleanup(&s->internal->aead_write_ctx->ctx); | 2634 | EVP_AEAD_CTX_cleanup(&s->internal->aead_write_ctx->ctx); |