diff options
| author | jsing <> | 2026-05-06 15:06:35 +0000 |
|---|---|---|
| committer | jsing <> | 2026-05-06 15:06:35 +0000 |
| commit | 97930339bcae324ce6c463f52bdcdf98c4be2941 (patch) | |
| tree | caa8b3dbcf94d357dc014532cae804dbeea5165b /src/lib/libssl/dtls_local.h | |
| parent | e162d1d43a0870508c4db32a52b441f1b7d96ebe (diff) | |
| download | openbsd-97930339bcae324ce6c463f52bdcdf98c4be2941.tar.gz openbsd-97930339bcae324ce6c463f52bdcdf98c4be2941.tar.bz2 openbsd-97930339bcae324ce6c463f52bdcdf98c4be2941.zip | |
Get rid of struct dtls1_retransmit_state.
In order to retransmit DTLS messages we potentially need to use the
record protection from a previous epoch. However, DTLS currently also
saves and restores the session, which is unnecessary - all of the
record protection and keys are handled in the TLS record layer.
Remove the rather useless dtls1_retransmit_state struct and just
keep the epoch - keeping pointers hanging around to sessions is pretty
nasty and unnecessary.
ok kenjiro@ tb@
Diffstat (limited to 'src/lib/libssl/dtls_local.h')
| -rw-r--r-- | src/lib/libssl/dtls_local.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/libssl/dtls_local.h b/src/lib/libssl/dtls_local.h index 3352b31d3c..5a85bba607 100644 --- a/src/lib/libssl/dtls_local.h +++ b/src/lib/libssl/dtls_local.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: dtls_local.h,v 1.3 2026/04/29 14:59:26 jsing Exp $ */ | 1 | /* $OpenBSD: dtls_local.h,v 1.4 2026/05/06 15:06:35 jsing 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. |
| @@ -77,19 +77,14 @@ typedef struct dtls1_bitmap_st { | |||
| 77 | encoding */ | 77 | encoding */ |
| 78 | } DTLS1_BITMAP; | 78 | } DTLS1_BITMAP; |
| 79 | 79 | ||
| 80 | struct dtls1_retransmit_state { | ||
| 81 | SSL_SESSION *session; | ||
| 82 | unsigned short epoch; | ||
| 83 | }; | ||
| 84 | |||
| 85 | struct hm_header_st { | 80 | struct hm_header_st { |
| 81 | uint16_t epoch; | ||
| 86 | unsigned char type; | 82 | unsigned char type; |
| 87 | unsigned long msg_len; | 83 | unsigned long msg_len; |
| 88 | unsigned short seq; | 84 | unsigned short seq; |
| 89 | unsigned long frag_off; | 85 | unsigned long frag_off; |
| 90 | unsigned long frag_len; | 86 | unsigned long frag_len; |
| 91 | unsigned int is_ccs; | 87 | unsigned int is_ccs; |
| 92 | struct dtls1_retransmit_state saved_retransmit_state; | ||
| 93 | }; | 88 | }; |
| 94 | 89 | ||
| 95 | struct dtls1_timeout_st { | 90 | struct dtls1_timeout_st { |
