From 2d0bd329829ba9f88f82ea7a0f710a93a2b33d8c Mon Sep 17 00:00:00 2001
From: Jerry Yu <jerry.h.yu@arm.com>
Date: Wed, 12 Jan 2022 12:58:00 +0800
Subject: [PATCH] fix various issues

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
---
 library/ssl_cli.c           | 2 +-
 library/ssl_misc.h          | 4 ++--
 library/ssl_tls13_generic.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 2c8aa37a32..a6f9e7dd1b 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -1133,7 +1133,7 @@ static int ssl_write_client_hello( mbedtls_ssl_context *ssl )
     if( ( ret = ssl_write_sig_alg_ext( ssl, p + 2 + ext_len,
                                        end, &olen ) ) != 0 )
     {
-        MBEDTLS_SSL_DEBUG_RET( 1, "ssl_write_sig_algs_ext", ret );
+        MBEDTLS_SSL_DEBUG_RET( 1, "ssl_write_sig_alg_ext", ret );
         return( ret );
     }
     ext_len += olen;
diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index 78c2d217e4..e77d98a4cf 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -1821,12 +1821,12 @@ static inline const void *mbedtls_ssl_conf_get_sig_algs(
 #if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED)
 
 #if defined(MBEDTLS_SSL_PROTO_TLS1_2)
-    if( mbedtls_ssl_conf_is_tls12_only( conf ))
+    if( mbedtls_ssl_conf_is_tls12_enabled( conf ))
         return( conf->sig_hashes );
 #endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
 
 #if defined(MBEDTLS_SSL_PROTO_TLS1_3)
-    if( mbedtls_ssl_conf_is_tls13_only( conf ))
+    if( mbedtls_ssl_conf_is_tls13_enabled( conf ))
         return( conf->tls13_sig_algs );
 #endif /* MBEDTLS_SSL_PROTO_TLS1_3 */
 
diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index 9ffd0788cd..b7084067f5 100644
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@@ -284,12 +284,12 @@ static void ssl_tls13_create_verify_structure( const unsigned char *transcript_h
 }
 
 static int ssl_tls13_sig_alg_is_offered( const mbedtls_ssl_context *ssl,
-                                         uint16_t received_sig_alg )
+                                         uint16_t proposed_sig_alg )
 {
     for( const uint16_t *sig_alg = mbedtls_ssl_conf_get_sig_algs( ssl->conf );
          *sig_alg != MBEDTLS_TLS1_3_SIG_NONE; sig_alg++ )
     {
-        if( *sig_alg == received_sig_alg )
+        if( *sig_alg == proposed_sig_alg )
             return( 1 );
     }
     return( 0 );