diff options
| author |   jsing <jsing@openbsd.org> | 2021-03-21 18:36:34 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2021-03-21 18:36:34 +0000 |
| commit | d4edc922de00e0977a67ceb1c4b74ab035533c7e (patch) | |
| tree | 3197dd6f6f75325215a27d268f794d3633bf34ac /lib/libssl/tls13_internal.h | |
| parent | Use new terminology of RFC 8981 and (mechanically) replace "privacy" (diff) | |
| download | wireguard-openbsd-d4edc922de00e0977a67ceb1c4b74ab035533c7e.tar.xz wireguard-openbsd-d4edc922de00e0977a67ceb1c4b74ab035533c7e.zip | |
Move the TLSv1.3 handshake struct inside the shared handshake struct.
There are currently three different handshake structs that are in use -
the SSL_HANDSHAKE struct (as S3I(s)->hs), the SSL_HANDSHAKE_TLS13 struct
(as S3I(s)->hs_tls13 or ctx->hs in the TLSv1.3 code) and the infamous
'tmp' embedded in SSL3_STATE_INTERNAL (as S3I(s)->tmp)).
This is the first step towards cleaning up the handshake structs so that
shared data is in the SSL_HANDSHAKE struct, with sub-structs for TLSv1.2
and TLSv1.3 specific information. Place SSL_HANDSHAKE_TLS13 inside
SSL_HANDSHAKE and change ctx->hs to refer to the SSL_HANDSHAKE struct
instead of the SSL_HANDSHAKE_TLS13 struct. This allows the TLSv1.3 code
to access the shared handshake data without needing the SSL struct.
ok inoguchi@ tb@
Diffstat (limited to 'lib/libssl/tls13_internal.h')
| -rw-r--r-- | lib/libssl/tls13_internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/tls13_internal.h b/lib/libssl/tls13_internal.h index c339a8ef102..973661acc9b 100644 --- a/lib/libssl/tls13_internal.h +++ b/lib/libssl/tls13_internal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tls13_internal.h,v 1.88 2021/01/05 17:40:11 tb Exp $ */ +/* $OpenBSD: tls13_internal.h,v 1.89 2021/03/21 18:36:34 jsing Exp $ */ /* * Copyright (c) 2018 Bob Beck <beck@openbsd.org> * Copyright (c) 2018 Theo Buehler <tb@openbsd.org> @@ -274,7 +274,7 @@ struct tls13_ctx { struct tls13_error error; SSL *ssl; - struct ssl_handshake_tls13_st *hs; + struct ssl_handshake_st *hs; uint8_t mode; struct tls13_handshake_stage handshake_stage; int handshake_started; |