commit f57b45660d8520028f06f626bf8cf9e395c7c57e
author Przemyslaw Stekiel <przemyslaw.stekiel@mobica.com> Tue Jan 25 00:04:18 2022 +0100
committer Przemyslaw Stekiel <przemyslaw.stekiel@mobica.com> Mon Jan 31 15:38:29 2022 +0100
tree 10edfe914c3de21c4ee7babb6775d8a0d5ab5756
parent 1d714479a3420e3f69744e5bb514392bdcaa4930

Rename tls_mbedtls_cipher_to_psa() to be consistent with function naming convention.

New function name:  mbedtls_ssl_cipher_to_psa().

Signed-off-by: Przemyslaw Stekiel <przemyslaw.stekiel@mobica.com>

library/ssl_misc.h

diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index 8155fb7..f3b4b9f 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -1305,7 +1305,7 @@
  * \return                     PSA_SUCCESS on success or PSA_ERROR_NOT_SUPPORTED if
  *                             conversion is not supported.
  */
-psa_status_t tls_mbedtls_cipher_to_psa( mbedtls_cipher_type_t mbedtls_cipher_type,
+psa_status_t mbedtls_ssl_cipher_to_psa( mbedtls_cipher_type_t mbedtls_cipher_type,
                                     size_t taglen,
                                     psa_algorithm_t *alg,
                                     psa_key_type_t *key_type,

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 0efdd3e..ba8a096 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1009,14 +1009,14 @@
     }
 
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-    if( ( status = tls_mbedtls_cipher_to_psa( cipher_info->type,
+    if( ( status = mbedtls_ssl_cipher_to_psa( cipher_info->type,
                                  transform->taglen,
                                  &alg,
                                  &key_type,
                                  &key_bits ) ) != PSA_SUCCESS )
     {
         ret = psa_status_to_mbedtls( status );
-        MBEDTLS_SSL_DEBUG_RET( 1, "tls_mbedtls_cipher_to_psa", ret );
+        MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ssl_cipher_to_psa", ret );
         goto end;
     }
 
@@ -4012,7 +4012,7 @@
     return( ret );
 }
 
-psa_status_t tls_mbedtls_cipher_to_psa( mbedtls_cipher_type_t mbedtls_cipher_type,
+psa_status_t mbedtls_ssl_cipher_to_psa( mbedtls_cipher_type_t mbedtls_cipher_type,
                                     size_t taglen,
                                     psa_algorithm_t *alg,
                                     psa_key_type_t *key_type,

library/ssl_tls13_keys.c

diff --git a/library/ssl_tls13_keys.c b/library/ssl_tls13_keys.c
index 5f0595b..13122c8 100644
--- a/library/ssl_tls13_keys.c
+++ b/library/ssl_tls13_keys.c
@@ -930,13 +930,13 @@
     /*
      * Setup psa keys and alg
      */
-    if( ( status = tls_mbedtls_cipher_to_psa( cipher_info->type,
+    if( ( status = mbedtls_ssl_cipher_to_psa( cipher_info->type,
                                  transform->taglen,
                                  &alg,
                                  &key_type,
                                  &key_bits ) ) != PSA_SUCCESS )
     {
-        MBEDTLS_SSL_DEBUG_RET( 1, "tls_mbedtls_cipher_to_psa", psa_status_to_mbedtls( status ) );
+        MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ssl_cipher_to_psa", psa_status_to_mbedtls( status ) );
         return( psa_status_to_mbedtls( status ) );
     }
 

tests/suites/test_suite_ssl.function

diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index acfc3a4..91858e4 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -1431,7 +1431,7 @@
 #endif /* MBEDTLS_SSL_DTLS_CONNECTION_ID */
 
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-    status = tls_mbedtls_cipher_to_psa( cipher_type,
+    status = mbedtls_ssl_cipher_to_psa( cipher_type,
                             t_in->taglen,
                             &alg,
                             &key_type,