commit 86981955666dd9284213668de7e887009f5b2338
author XiaokangQian <xiaokang.qian@arm.com> Tue Jul 19 09:51:50 2022 +0000
committer Ronald Cron <ronald.cron@arm.com> Thu Jul 21 15:30:04 2022 +0200
tree 54a3f143ad0f6800b264aa9388dbb12f3ae21335
parent adab9a64400796fb53a1911dc2ec9e6a2b16450f

Address comments of various issues

Improve comments
Change coding style
Rename functions

Change-Id: Ia111aef303932cfeee693431c3d48f90342b32e5
Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>

library/ssl_client.c

diff --git a/library/ssl_client.c b/library/ssl_client.c
index afe07e8..ee5a78a 100644
--- a/library/ssl_client.c
+++ b/library/ssl_client.c
@@ -645,6 +645,9 @@
 
 #if defined(MBEDTLS_SSL_PROTO_TLS1_3) && \
     defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
+    /* The "pre_shared_key" extension (RFC 8446 Section 4.2.11)
+     * MUST be the last extension in the ClientHello.
+     */
     if( propose_tls13 && mbedtls_ssl_conf_tls13_some_psk_enabled( ssl ) )
     {
         ret = mbedtls_ssl_tls13_write_pre_shared_key_ext_without_binders(
@@ -907,11 +910,11 @@
         if( binders_len > 0 )
         {
             MBEDTLS_SSL_PROC_CHK(
-                mbedtls_ssl_tls13_write_pre_shared_key_ext_binders(
+                mbedtls_ssl_tls13_write_binders_of_pre_shared_key_ext(
                       ssl, buf + msg_len - binders_len, buf + msg_len ) );
+            ssl->handshake->update_checksum( ssl, buf + msg_len - binders_len,
+                                             binders_len );
         }
-        ssl->handshake->update_checksum( ssl, buf + msg_len - binders_len,
-                                         binders_len );
 #endif /* MBEDTLS_SSL_PROTO_TLS1_3 && MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED */
 
         MBEDTLS_SSL_PROC_CHK( mbedtls_ssl_finish_handshake_msg( ssl,