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>

library/ssl_tls13_client.c

diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index 405cce0..d276a95 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -2542,7 +2542,6 @@
         switch( extension_type )
         {
             case MBEDTLS_TLS_EXT_EARLY_DATA:
-                MBEDTLS_SSL_DEBUG_MSG( 4, ( "early_data extension received" ) );
                 if( extension_data_len != 4 )
                 {
                     MBEDTLS_SSL_PEND_FATAL_ALERT(

library/ssl_tls13_generic.c

diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index 0479038..761c00e 100644
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@@ -1395,13 +1395,14 @@
     ((void) ssl);
 
     MBEDTLS_SSL_CHK_BUF_PTR( p, end, 4 );
-    MBEDTLS_SSL_DEBUG_MSG(
-            3, ( "client hello, adding early_data extension" ) );
 
     MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_EARLY_DATA, p, 0 );
     MBEDTLS_PUT_UINT16_BE( 0, p, 2 );
 
     *out_len = 4;
+
+    mbedtls_ssl_tls13_set_hs_sent_ext_mask( ssl, MBEDTLS_TLS_EXT_EARLY_DATA );
+
     return( 0 );
 }
 #endif /* MBEDTLS_SSL_EARLY_DATA */