eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refine ticket_flags printing helper

Browse source 
Signed-off-by: Pengyu Lv <pengyu.lv@arm.com>
This commit is contained in:
Pengyu Lv 2023-01-16 11:28:49 +08:00
parent acecf9c95b
commit 4938a566bf
4 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
library/ssl_debug_helpers.h
View file

@ -56,9 +56,9 @@ void mbedtls_ssl_print_extension(const mbedtls_ssl_context *ssl,
const char *extra_msg0, const char *extra_msg1); const char *extra_msg0, const char *extra_msg1);
#if defined(MBEDTLS_SSL_PROTO_TLS1_3) && defined(MBEDTLS_SSL_SESSION_TICKETS) #if defined(MBEDTLS_SSL_PROTO_TLS1_3) && defined(MBEDTLS_SSL_SESSION_TICKETS)
void mbedtls_debug_print_ticket_flags(const mbedtls_ssl_context *ssl, void mbedtls_ssl_print_ticket_flags(const mbedtls_ssl_context *ssl,
int level, const char *file, int line, int level, const char *file, int line,
unsigned int flag); unsigned int flags);
#endif /* MBEDTLS_SSL_PROTO_TLS1_3 && MBEDTLS_SSL_SESSION_TICKETS */ #endif /* MBEDTLS_SSL_PROTO_TLS1_3 && MBEDTLS_SSL_SESSION_TICKETS */
#define MBEDTLS_SSL_PRINT_EXTS(level, hs_msg_type, extensions_mask) \ #define MBEDTLS_SSL_PRINT_EXTS(level, hs_msg_type, extensions_mask) \
@ -71,8 +71,8 @@ void mbedtls_debug_print_ticket_flags(const mbedtls_ssl_context *ssl,
extra, NULL) extra, NULL)
#if defined(MBEDTLS_SSL_PROTO_TLS1_3) && defined(MBEDTLS_SSL_SESSION_TICKETS) #if defined(MBEDTLS_SSL_PROTO_TLS1_3) && defined(MBEDTLS_SSL_SESSION_TICKETS)
#define MBEDTLS_SSL_DEBUG_TICKET_FLAGS(level, flag) \ #define MBEDTLS_SSL_PRINT_TICKET_FLAGS(level, flags) \
mbedtls_debug_print_ticket_flags(ssl, level, __FILE__, __LINE__, flag) mbedtls_ssl_print_ticket_flags(ssl, level, __FILE__, __LINE__, flags)
#endif #endif
#else #else
@ -82,7 +82,7 @@ void mbedtls_debug_print_ticket_flags(const mbedtls_ssl_context *ssl,
#define MBEDTLS_SSL_PRINT_EXT(level, hs_msg_type, extension_type, extra) #define MBEDTLS_SSL_PRINT_EXT(level, hs_msg_type, extension_type, extra)
#if defined(MBEDTLS_SSL_PROTO_TLS1_3) && defined(MBEDTLS_SSL_SESSION_TICKETS) #if defined(MBEDTLS_SSL_PROTO_TLS1_3) && defined(MBEDTLS_SSL_SESSION_TICKETS)
#define MBEDTLS_SSL_DEBUG_TICKET_FLAGS(level, flag) #define MBEDTLS_SSL_PRINT_TICKET_FLAGS(level, flags)
#endif #endif
#endif /* MBEDTLS_DEBUG_C */ #endif /* MBEDTLS_DEBUG_C */

12
library/ssl_tls.c
View file

@ -745,17 +745,19 @@ static const char *ticket_flag_name_table[] =
[3] = "ALLOW_EARLY_DATA", [3] = "ALLOW_EARLY_DATA",
}; };
void mbedtls_debug_print_ticket_flags( void mbedtls_ssl_print_ticket_flags(const mbedtls_ssl_context *ssl,
const mbedtls_ssl_context *ssl, int level, int level, const char *file, int line,
const char *file, int line, unsigned int flag) unsigned int flags)
{ {
size_t i; size_t i;
mbedtls_debug_print_msg(ssl, level, file, line, mbedtls_debug_print_msg(ssl, level, file, line,
"print ticket_flags (0x%02x)", flag); "print ticket_flags (0x%02x)", flags);
flags = flags & MBEDTLS_SSL_TLS1_3_TICKET_FLAGS_MASK;
for (i = 0; i < ARRAY_LENGTH(ticket_flag_name_table); i++) { for (i = 0; i < ARRAY_LENGTH(ticket_flag_name_table); i++) {
if ((flag & (1 << i)) & MBEDTLS_SSL_TLS1_3_TICKET_FLAGS_MASK) { if ((flags & (1 << i))) {
mbedtls_debug_print_msg(ssl, level, file, line, "- %s is set.", mbedtls_debug_print_msg(ssl, level, file, line, "- %s is set.",
ticket_flag_name_table[i]); ticket_flag_name_table[i]);
} }

2
library/ssl_tls13_client.c
View file

@ -2719,7 +2719,7 @@ static int ssl_tls13_postprocess_new_session_ticket(mbedtls_ssl_context *ssl,
/* Set ticket_flags depends on the selected key exchange modes */ /* Set ticket_flags depends on the selected key exchange modes */
mbedtls_ssl_session_set_ticket_flags( mbedtls_ssl_session_set_ticket_flags(
session, ssl->conf->tls13_kex_modes); session, ssl->conf->tls13_kex_modes);
MBEDTLS_SSL_DEBUG_TICKET_FLAGS(4, session->ticket_flags); MBEDTLS_SSL_PRINT_TICKET_FLAGS(4, session->ticket_flags);
return 0; return 0;
} }

4
library/ssl_tls13_server.c
View file

@ -170,7 +170,7 @@ static int ssl_tls13_offered_psks_check_identity_match_ticket(
* We regard the ticket with incompatible key exchange modes as not match. * We regard the ticket with incompatible key exchange modes as not match.
*/ */
ret = MBEDTLS_ERR_ERROR_GENERIC_ERROR; ret = MBEDTLS_ERR_ERROR_GENERIC_ERROR;
MBEDTLS_SSL_DEBUG_TICKET_FLAGS(4, MBEDTLS_SSL_PRINT_TICKET_FLAGS(4,
session->ticket_flags); session->ticket_flags);
if (mbedtls_ssl_tls13_check_kex_modes(ssl, if (mbedtls_ssl_tls13_check_kex_modes(ssl,
mbedtls_ssl_session_get_ticket_flags( mbedtls_ssl_session_get_ticket_flags(
@ -2639,7 +2639,7 @@ static int ssl_tls13_prepare_new_session_ticket(mbedtls_ssl_context *ssl,
mbedtls_ssl_session_set_ticket_flags( mbedtls_ssl_session_set_ticket_flags(
session, ssl->handshake->tls13_kex_modes); session, ssl->handshake->tls13_kex_modes);
#endif #endif
MBEDTLS_SSL_DEBUG_TICKET_FLAGS(4, session->ticket_flags); MBEDTLS_SSL_PRINT_TICKET_FLAGS(4, session->ticket_flags);
/* Generate ticket_age_add */ /* Generate ticket_age_add */
if ((ret = ssl->conf->f_rng(ssl->conf->p_rng, if ((ret = ssl->conf->f_rng(ssl->conf->p_rng,