tls13: add more checks for server early data
- check if it is enabled - check if it is psk mode - check if it is resumption - check if it is tls13 version Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
parent
51328162e6
commit
985c967a14
1 changed files with 35 additions and 1 deletions
|
@ -1752,6 +1752,7 @@ static int ssl_tls13_parse_client_hello(mbedtls_ssl_context *ssl,
|
||||||
#if defined(MBEDTLS_SSL_EARLY_DATA)
|
#if defined(MBEDTLS_SSL_EARLY_DATA)
|
||||||
static void ssl_tls13_update_early_data_status(mbedtls_ssl_context *ssl)
|
static void ssl_tls13_update_early_data_status(mbedtls_ssl_context *ssl)
|
||||||
{
|
{
|
||||||
|
mbedtls_ssl_session *session = ssl->session_negotiate;
|
||||||
mbedtls_ssl_handshake_params *handshake = ssl->handshake;
|
mbedtls_ssl_handshake_params *handshake = ssl->handshake;
|
||||||
|
|
||||||
if ((handshake->received_extensions &
|
if ((handshake->received_extensions &
|
||||||
|
@ -1762,9 +1763,42 @@ static void ssl_tls13_update_early_data_status(mbedtls_ssl_context *ssl)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* We do not accept early data for the time being */
|
|
||||||
ssl->early_data_status = MBEDTLS_SSL_EARLY_DATA_STATUS_REJECTED;
|
ssl->early_data_status = MBEDTLS_SSL_EARLY_DATA_STATUS_REJECTED;
|
||||||
|
|
||||||
|
if (ssl->conf->early_data_enabled == MBEDTLS_SSL_EARLY_DATA_DISABLED) {
|
||||||
|
MBEDTLS_SSL_DEBUG_MSG(
|
||||||
|
1, ("EarlyData: rejected. configured disabled."));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
MBEDTLS_SSL_DEBUG_MSG(
|
||||||
|
3, ("EarlyData: conf->max_early_data_size = %u",
|
||||||
|
(unsigned int) ssl->conf->max_early_data_size));
|
||||||
|
|
||||||
|
if (!mbedtls_ssl_conf_tls13_some_psk_enabled(ssl)) {
|
||||||
|
MBEDTLS_SSL_DEBUG_MSG(
|
||||||
|
1,
|
||||||
|
("EarlyData: rejected. psk or psk_ephemeral is not available."));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (handshake && handshake->resume != 1) {
|
||||||
|
MBEDTLS_SSL_DEBUG_MSG(
|
||||||
|
1, ("EarlyData: rejected. not resumption session."));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (session->tls_version != MBEDTLS_SSL_VERSION_TLS1_3) {
|
||||||
|
MBEDTLS_SSL_DEBUG_MSG(
|
||||||
|
1,
|
||||||
|
("EarlyData: rejected. not a TLS 1.3 ticket."));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* TODO: Add more checks here. */
|
||||||
|
|
||||||
|
ssl->early_data_status = MBEDTLS_SSL_EARLY_DATA_STATUS_ACCEPTED;
|
||||||
|
|
||||||
}
|
}
|
||||||
#endif /* MBEDTLS_SSL_EARLY_DATA */
|
#endif /* MBEDTLS_SSL_EARLY_DATA */
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue