diff options
author | jsing <> | 2021-01-13 18:20:54 +0000 |
---|---|---|
committer | jsing <> | 2021-01-13 18:20:54 +0000 |
commit | 9a0dba9f6be22dea02c323e4d3a7d4a5dde36ea4 (patch) | |
tree | 65b71b1e9d3928028351a0aee3a2d427b47d8dff /src/lib/libssl/ssl_locl.h | |
parent | 4f375cd7c6652350830e386787ddf80aedd74b45 (diff) | |
download | openbsd-9a0dba9f6be22dea02c323e4d3a7d4a5dde36ea4.tar.gz openbsd-9a0dba9f6be22dea02c323e4d3a7d4a5dde36ea4.tar.bz2 openbsd-9a0dba9f6be22dea02c323e4d3a7d4a5dde36ea4.zip |
Clean up sequence number handing in the new TLSv1.2 record layer.
Handle protocol specific (DTLS vs TLS) sequence number differences in the
open/seal record functions and propagate the sequence number through to
the called functions. This means that DTLS specific knowledge is limited
to two functions and also avoids building sequence numbers multiple times
over. As a result, the DTLS explicit sequence number is now extracted from
the record header and passed through for processing, which makes the read
epoch handling redundant.
ok inoguchi@ tb@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 5c646d2208..560fcdc1a4 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.311 2021/01/07 15:32:59 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.312 2021/01/13 18:20:54 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 | * |
@@ -479,8 +479,6 @@ void tls12_record_layer_alert(struct tls12_record_layer *rl, | |||
479 | uint8_t *alert_desc); | 479 | uint8_t *alert_desc); |
480 | void tls12_record_layer_set_version(struct tls12_record_layer *rl, | 480 | void tls12_record_layer_set_version(struct tls12_record_layer *rl, |
481 | uint16_t version); | 481 | uint16_t version); |
482 | void tls12_record_layer_set_read_epoch(struct tls12_record_layer *rl, | ||
483 | uint16_t epoch); | ||
484 | void tls12_record_layer_set_write_epoch(struct tls12_record_layer *rl, | 482 | void tls12_record_layer_set_write_epoch(struct tls12_record_layer *rl, |
485 | uint16_t epoch); | 483 | uint16_t epoch); |
486 | void tls12_record_layer_clear_read_state(struct tls12_record_layer *rl); | 484 | void tls12_record_layer_clear_read_state(struct tls12_record_layer *rl); |