commit bc75bc0c3a42ceb7846dc23ee0836a273cff2e49
author Xiaokang Qian <xiaokang.qian@arm.com> Mon Dec 19 06:16:42 2022 +0000
committer Xiaokang Qian <xiaokang.qian@arm.com> Wed Feb 08 05:44:00 2023 +0000
tree 689c88f74123a1932b5290fe3e9608b988e7b7f3
parent c81a15a019f17d8a2ab8690da24270157d306897

Switch to MBEDTLS_SSL_END_OF_EARLY_DATA as needed

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

library/ssl_tls13_client.c

diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index 9dd0570..8edbd8f 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -2455,7 +2455,19 @@
         return ret;
     }
 
-    mbedtls_ssl_handshake_set_state(ssl, MBEDTLS_SSL_END_OF_EARLY_DATA);
+#if defined(MBEDTLS_SSL_EARLY_DATA)
+    if (ssl->early_data_status == MBEDTLS_SSL_EARLY_DATA_STATUS_ACCEPTED) {
+        mbedtls_ssl_handshake_set_state(ssl, MBEDTLS_SSL_END_OF_EARLY_DATA);
+    } else
+#endif /* MBEDTLS_SSL_EARLY_DATA */
+    {
+#if defined(MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE)
+        mbedtls_ssl_handshake_set_state(
+            ssl, MBEDTLS_SSL_CLIENT_CCS_AFTER_SERVER_FINISHED);
+#else
+        mbedtls_ssl_handshake_set_state(ssl, MBEDTLS_SSL_CLIENT_CERTIFICATE);
+#endif /* MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE */
+    }
 
     return 0;
 }