commit 95b743ca1771b15d1258bb20a3caf8552336805f
author Jerry Yu <jerry.h.yu@arm.com> Sat Jul 23 11:37:50 2022 +0800
committer Jerry Yu <jerry.h.yu@arm.com> Thu Jul 28 23:08:00 2022 +0800
tree 9cc1db94f13c430a1bc9c52f5175b5732b658418
parent eec4f03c6092605aaf3cfb77a5d4c6c7a4503c3b

Rename get_pk_type_and_md_alg

The function is for both tls12 and tls13 now.

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>

library/ssl_misc.h

diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index 88ba65d..e76086a 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -2092,7 +2092,7 @@
     return( 0 );
 }
 
-static inline int mbedtls_ssl_tls13_get_pk_type_and_md_alg_from_sig_alg(
+static inline int mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg(
     uint16_t sig_alg, mbedtls_pk_type_t *pk_type, mbedtls_md_type_t *md_alg )
 {
     *pk_type = mbedtls_ssl_pk_alg_from_sig( sig_alg & 0xff );

library/ssl_tls12_client.c

diff --git a/library/ssl_tls12_client.c b/library/ssl_tls12_client.c
index 47557ae..3ac17ce 100644
--- a/library/ssl_tls12_client.c
+++ b/library/ssl_tls12_client.c
@@ -2359,7 +2359,7 @@
          */
         MBEDTLS_SSL_CHK_BUF_READ_PTR( p, end, 2 );
         sig_alg = MBEDTLS_GET_UINT16_BE( p, 0 );
-        if( mbedtls_ssl_tls13_get_pk_type_and_md_alg_from_sig_alg(
+        if( mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg(
                                             sig_alg, &pk_alg, &md_alg ) != 0 &&
             ! mbedtls_ssl_sig_alg_is_offered( ssl, sig_alg ) &&
             ! mbedtls_ssl_sig_alg_is_supported( ssl, sig_alg ) )

library/ssl_tls13_generic.c

diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index d1e2e49..64e134d 100644
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@@ -213,7 +213,7 @@
         goto error;
     }
 
-    if( mbedtls_ssl_tls13_get_pk_type_and_md_alg_from_sig_alg(
+    if( mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg(
                                         algorithm, &sig_alg, &md_alg ) != 0 )
     {
         goto error;
@@ -1029,7 +1029,7 @@
     MBEDTLS_SSL_DEBUG_MSG( 2, ( "CertificateVerify with %s",
                                 mbedtls_ssl_sig_alg_to_str( algorithm )) );
 
-    if( mbedtls_ssl_tls13_get_pk_type_and_md_alg_from_sig_alg(
+    if( mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg(
                                         algorithm, &pk_type, &md_alg ) != 0 )
     {
         return( MBEDTLS_ERR_SSL_INTERNAL_ERROR  );