From acecf9c95bb13d11e441f3557cff1733f3622fe3 Mon Sep 17 00:00:00 2001
From: Pengyu Lv <pengyu.lv@arm.com>
Date: Mon, 16 Jan 2023 11:23:24 +0800
Subject: [PATCH] make ticket_flags param types consistent

When ticket_flags used as parameter, use unsigned int,
instead of uint8_t or mbedtls_ssl_tls13_ticket_flags.Also
remove the definition of mbedtls_ssl_tls13_ticket_flags.

Signed-off-by: Pengyu Lv <pengyu.lv@arm.com>
---
 include/mbedtls/ssl.h       | 2 --
 library/ssl_debug_helpers.h | 2 +-
 library/ssl_misc.h          | 6 +++---
 library/ssl_tls.c           | 3 +--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index 661b23ce7..dbc37e831 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 880ff6967..84432a3d5 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 b3d91125a..146dae0fb 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 375233d57..fdec4904e 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;