commit 3ad67bf4e384d71f5f85309c6a397e822c8b29f1
author XiaokangQian <xiaokang.qian@arm.com> Thu Jul 21 02:26:21 2022 +0000
committer Ronald Cron <ronald.cron@arm.com> Thu Jul 21 15:30:04 2022 +0200
tree 779acb1bfd1b68aff23f1c5ad98b999d0c56d27d
parent 088c92977e71787b484ad731e76bd868e73b6a5e

Rename functions and add test messages

Change-Id: Iab51b031ae82d7b2d384de708858be64be75f9ed
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 ee5a78a..e7453d5 100644
--- a/library/ssl_client.c
+++ b/library/ssl_client.c
@@ -650,7 +650,7 @@
      */
     if( propose_tls13 && mbedtls_ssl_conf_tls13_some_psk_enabled( ssl ) )
     {
-        ret = mbedtls_ssl_tls13_write_pre_shared_key_ext_without_binders(
+        ret = mbedtls_ssl_tls13_write_identities_of_pre_shared_key_ext(
                   ssl, p, end, &output_len, binders_len );
         if( ret != 0 )
             return( ret );

library/ssl_misc.h

diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index 295ff9f..ca57114 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -2448,7 +2448,7 @@
  *                          the extension.
  */
 MBEDTLS_CHECK_RETURN_CRITICAL
-int mbedtls_ssl_tls13_write_pre_shared_key_ext_without_binders(
+int mbedtls_ssl_tls13_write_identities_of_pre_shared_key_ext(
     mbedtls_ssl_context *ssl,
     unsigned char *buf, unsigned char *end,
     size_t *out_len, size_t *binders_len );

library/ssl_tls13_client.c

diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index 5c693bd..b23b0c5 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -692,7 +692,7 @@
 
 #if defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
 
-int mbedtls_ssl_tls13_write_pre_shared_key_ext_without_binders(
+int mbedtls_ssl_tls13_write_identities_of_pre_shared_key_ext(
     mbedtls_ssl_context *ssl,
     unsigned char *buf, unsigned char *end,
     size_t *out_len, size_t *binders_len )

library/ssl_tls13_generic.c

diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index 9fd246d..1e63c77 100644
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@@ -1509,7 +1509,6 @@
 /* Check if we have any PSK to offer, returns 0 if PSK is available.
  * Assign the psk and ticket if pointers are present.
  */
-MBEDTLS_CHECK_RETURN_CRITICAL
 int mbedtls_ssl_get_psk_to_offer(
         const mbedtls_ssl_context *ssl,
         int *psk_type,