commit 2cd5ce0c6b41dbe69c39c3cda2bd491a04d9effb
author Xiaokang Qian <xiaokang.qian@arm.com> Tue Nov 15 10:33:53 2022 +0000
committer Xiaokang Qian <xiaokang.qian@arm.com> Tue Nov 15 10:33:53 2022 +0000
tree b4590e305f33d7f481f2cf4fae2774b331bbd080
parent 72b9b17e1120f5c4c8ff7911697c57d73a26f8ee

Fix various issues cause rebase to latest code

Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>

include/mbedtls/ssl.h

diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index 5294ec2..6829fd7 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -816,9 +816,12 @@
     MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK /* 1U << 0 */
 #define MBEDTLS_SSL_TLS1_3_TICKET_ALLOW_PSK_EPHEMERAL_RESUMPTION \
     MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL /* 1U << 2 */
-#define MBEDTLS_SSL_TLS1_3_TICKET_ALLOW_EARLY_DATA \
-    MBEDTLS_SSL_TLS1_3_TICKET_ALLOW_PSK_EPHEMERAL_RESUMPTION << 1
+#define MBEDTLS_SSL_TLS1_3_TICKET_ALLOW_EARLY_DATA ( 1U << 3 )
 
+#define MBEDTLS_SSL_TLS1_3_TICKET_FLAGS_MASK                               \
+            ( MBEDTLS_SSL_TLS1_3_TICKET_ALLOW_PSK_RESUMPTION             | \
+              MBEDTLS_SSL_TLS1_3_TICKET_ALLOW_PSK_EPHEMERAL_RESUMPTION   | \
+              MBEDTLS_SSL_TLS1_3_TICKET_ALLOW_EARLY_DATA )
 #endif /* MBEDTLS_SSL_PROTO_TLS1_3 && MBEDTLS_SSL_SESSION_TICKETS */
 /**
  * \brief          Callback type: server-side session cache getter