mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-01 22:20:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove end_of_early_data_coordinate() to align with exist style

Browse Source 
Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>
This commit is contained in:
Xiaokang Qian 2022-12-19 06:34:44 +00:00
parent bc75bc0c3a
commit 742578ca2c
1 changed files with 13 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
library/ssl_tls13_client.c
View File

@ -2120,41 +2120,12 @@ cleanup:
* Finished. Otherwise, the client MUST NOT send an EndOfEarlyData message. * Finished. Otherwise, the client MUST NOT send an EndOfEarlyData message.
*/ */
#define SSL_END_OF_EARLY_DATA_WRITE 0
#define SSL_END_OF_EARLY_DATA_SKIP 1
MBEDTLS_CHECK_RETURN_CRITICAL
static int ssl_tls13_write_end_of_early_data_coordinate(
mbedtls_ssl_context *ssl)
{
((void) ssl);
#if defined(MBEDTLS_SSL_EARLY_DATA)
if (ssl->early_data_status == MBEDTLS_SSL_EARLY_DATA_STATUS_ACCEPTED) {
return SSL_END_OF_EARLY_DATA_WRITE;
} else if (ssl->early_data_status == MBEDTLS_SSL_EARLY_DATA_STATUS_REJECTED) {
MBEDTLS_SSL_DEBUG_MSG(4, ("skip EndOfEarlyData, server rejected"));
return SSL_END_OF_EARLY_DATA_SKIP;
} else {
MBEDTLS_SSL_DEBUG_MSG(4, ("skip write EndOfEarlyData"));
}
#endif /* MBEDTLS_SSL_EARLY_DATA */
return SSL_END_OF_EARLY_DATA_SKIP;
}
MBEDTLS_CHECK_RETURN_CRITICAL MBEDTLS_CHECK_RETURN_CRITICAL
static int ssl_tls13_finalize_write_end_of_early_data( static int ssl_tls13_finalize_write_end_of_early_data(
mbedtls_ssl_context *ssl) mbedtls_ssl_context *ssl)
{ {
#if defined(MBEDTLS_SSL_EARLY_DATA) || \
!defined(MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE)
mbedtls_ssl_handshake_set_state(ssl, MBEDTLS_SSL_CLIENT_CERTIFICATE); mbedtls_ssl_handshake_set_state(ssl, MBEDTLS_SSL_CLIENT_CERTIFICATE);
#else
mbedtls_ssl_handshake_set_state(
ssl, MBEDTLS_SSL_CLIENT_CCS_AFTER_SERVER_FINISHED);
#endif /* MBEDTLS_SSL_EARLY_DATA ||
!MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE */
return 0; return 0;
} }
@ -2165,27 +2136,23 @@ static int ssl_tls13_write_end_of_early_data(mbedtls_ssl_context *ssl)
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
MBEDTLS_SSL_DEBUG_MSG(2, ("=> write EndOfEarlyData")); MBEDTLS_SSL_DEBUG_MSG(2, ("=> write EndOfEarlyData"));
MBEDTLS_SSL_PROC_CHK_NEG( unsigned char *buf = NULL;
ssl_tls13_write_end_of_early_data_coordinate(ssl)); size_t buf_len;
if (ret == SSL_END_OF_EARLY_DATA_WRITE) {
unsigned char *buf = NULL;
size_t buf_len;
MBEDTLS_SSL_DEBUG_MSG(2, ("Client write EndOfEarlyData")); MBEDTLS_SSL_DEBUG_MSG(2, ("Client write EndOfEarlyData"));
MBEDTLS_SSL_PROC_CHK(mbedtls_ssl_start_handshake_msg( MBEDTLS_SSL_PROC_CHK(mbedtls_ssl_start_handshake_msg(
ssl, MBEDTLS_SSL_HS_END_OF_EARLY_DATA, &buf, &buf_len)); ssl, MBEDTLS_SSL_HS_END_OF_EARLY_DATA, &buf, &buf_len));
mbedtls_ssl_add_hs_hdr_to_checksum( mbedtls_ssl_add_hs_hdr_to_checksum(
ssl, MBEDTLS_SSL_HS_END_OF_EARLY_DATA, 0); ssl, MBEDTLS_SSL_HS_END_OF_EARLY_DATA, 0);
MBEDTLS_SSL_PROC_CHK( MBEDTLS_SSL_PROC_CHK(
mbedtls_ssl_finish_handshake_msg(ssl, buf_len, 0)); mbedtls_ssl_finish_handshake_msg(ssl, buf_len, 0));
/* Switch outbound back to handshake key after end_of_early_data */ /* Switch outbound back to handshake key after end_of_early_data */
mbedtls_ssl_set_outbound_transform( mbedtls_ssl_set_outbound_transform(
ssl, ssl->handshake->transform_handshake); ssl, ssl->handshake->transform_handshake);
}
MBEDTLS_SSL_PROC_CHK( MBEDTLS_SSL_PROC_CHK(
ssl_tls13_finalize_write_end_of_early_data(ssl)); ssl_tls13_finalize_write_end_of_early_data(ssl));