diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h index 661b23ce7b..dbc37e831c 100644 --- a/include/mbedtls/ssl.h +++ b/include/mbedtls/ssl.h @@ -809,8 +809,6 @@ typedef struct mbedtls_ssl_flight_item mbedtls_ssl_flight_item; #endif #if defined(MBEDTLS_SSL_PROTO_TLS1_3) && defined(MBEDTLS_SSL_SESSION_TICKETS) -typedef uint8_t mbedtls_ssl_tls13_ticket_flags; - #define MBEDTLS_SSL_TLS1_3_TICKET_ALLOW_PSK_RESUMPTION \ MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK /* 1U << 0 */ #define MBEDTLS_SSL_TLS1_3_TICKET_ALLOW_PSK_EPHEMERAL_RESUMPTION \ diff --git a/library/ssl_debug_helpers.h b/library/ssl_debug_helpers.h index 880ff69671..84432a3d53 100644 --- a/library/ssl_debug_helpers.h +++ b/library/ssl_debug_helpers.h @@ -58,7 +58,7 @@ void mbedtls_ssl_print_extension(const mbedtls_ssl_context *ssl, #if defined(MBEDTLS_SSL_PROTO_TLS1_3) && defined(MBEDTLS_SSL_SESSION_TICKETS) void mbedtls_debug_print_ticket_flags(const mbedtls_ssl_context *ssl, int level, const char *file, int line, - mbedtls_ssl_tls13_ticket_flags flag); + unsigned int flag); #endif /* MBEDTLS_SSL_PROTO_TLS1_3 && MBEDTLS_SSL_SESSION_TICKETS */ #define MBEDTLS_SSL_PRINT_EXTS(level, hs_msg_type, extensions_mask) \ diff --git a/library/ssl_misc.h b/library/ssl_misc.h index b3d91125ad..146dae0fb2 100644 --- a/library/ssl_misc.h +++ b/library/ssl_misc.h @@ -2721,20 +2721,20 @@ int mbedtls_ssl_session_set_hostname(mbedtls_ssl_session *session, #if defined(MBEDTLS_SSL_PROTO_TLS1_3) && defined(MBEDTLS_SSL_SESSION_TICKETS) static inline unsigned int mbedtls_ssl_session_get_ticket_flags( - mbedtls_ssl_session *session, uint8_t flags) + mbedtls_ssl_session *session, unsigned int flags) { return session->ticket_flags & (flags & MBEDTLS_SSL_TLS1_3_TICKET_FLAGS_MASK); } static inline void mbedtls_ssl_session_set_ticket_flags( - mbedtls_ssl_session *session, uint8_t flags) + mbedtls_ssl_session *session, unsigned int flags) { session->ticket_flags |= (flags & MBEDTLS_SSL_TLS1_3_TICKET_FLAGS_MASK); } static inline void mbedtls_ssl_session_clear_ticket_flags( - mbedtls_ssl_session *session, uint8_t flags) + mbedtls_ssl_session *session, unsigned int flags) { session->ticket_flags &= ~(flags & MBEDTLS_SSL_TLS1_3_TICKET_FLAGS_MASK); } diff --git a/library/ssl_tls.c b/library/ssl_tls.c index 375233d571..fdec4904ef 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -747,8 +747,7 @@ static const char *ticket_flag_name_table[] = void mbedtls_debug_print_ticket_flags( const mbedtls_ssl_context *ssl, int level, - const char *file, int line, - mbedtls_ssl_tls13_ticket_flags flag) + const char *file, int line, unsigned int flag) { size_t i;