Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify TLS 1.3 handshake state machine and handshake handlers #347

Merged
merged 16 commits into from
Aug 8, 2021
Merged

Simplify TLS 1.3 handshake state machine and handshake handlers #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0386539
Remove dedicated state for 2nd client hello from client
Aug 8, 2021
09d78ec
Simplify top-level client-side state machine dispatch
Aug 8, 2021
9a59f7d
Remove dedicated client-side handshake state for second ServerHello
Aug 8, 2021
6d26c76
Move client-side handshake state update after ticket into handler
Aug 8, 2021
fb22373
Move handshake state updates into handlers
Aug 8, 2021
b6997d1
Adjust 1.3 client state machine code structure to TLS 1.2
Aug 8, 2021
b09e5a1
Remove unnecessary flushes from handshake state handlers
Aug 8, 2021
e4ca327
Add handshake msg write wrapper hiding MPS / non-MPS differences
Aug 8, 2021
837b3ae
Unify MPS / non-MPS code for outgoing finished and CertReq message
Aug 8, 2021
fa6ccfc
Use MPS/non-MPS wrappers for EndOfEarlyData
Aug 8, 2021
807221a
Use MPS/non-MPS wrapper for ClientHello writing
Aug 8, 2021
d235cf4
Use MPS/non-MPS wrapper for CertificateVerify writing
Aug 8, 2021
4cbd06e
Use MPS/non-MPS wrapper for Certificate writing
Aug 8, 2021
df23cd2
Use MPS/non-MPS wrapper for NewSessionTicket writer
Aug 8, 2021
f2dc6aa
Use MPS/non-MPS wrapper for HRR writing
Aug 8, 2021
f193178
Use MPS/non-MPS writer for ServerHello writing
Aug 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions library/ssl_misc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,10 @@ struct mbedtls_ssl_handshake_params

mbedtls_ssl_tls_prf_cb *tls_prf;

#if defined(MBEDTLS_SSL_USE_MPS)
mbedtls_mps_handshake_out hs_msg_out;
#endif

/*
* State-local variables used during the processing
* of a specific handshake state.
Expand Down Expand Up @@ -2015,6 +2019,14 @@ static inline int mbedtls_ssl_named_group_is_ecdhe( uint16_t named_group )
named_group == MBEDTLS_SSL_TLS13_NAMED_GROUP_X448 );
}

int mbedtls_ssl_start_handshake_msg( mbedtls_ssl_context *ssl,
unsigned hs_type,
unsigned char **buf,
size_t *buflen );
int mbedtls_ssl_finish_handshake_msg( mbedtls_ssl_context *ssl,
size_t buf_len,
size_t msg_len );

#endif /* MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL */


Expand Down
Loading