From 9b22c2b1e66506fbdfb2dcf3fce5e2e6797ec724 Mon Sep 17 00:00:00 2001 From: Przemyslaw Stekiel Date: Wed, 19 Jan 2022 16:09:58 +0100 Subject: [PATCH] Rename: mbedtls_cipher_to_psa -> tls_mbedtls_cipher_to_psa Signed-off-by: Przemyslaw Stekiel --- library/ssl_misc.h | 2 +- library/ssl_tls.c | 6 +++--- library/ssl_tls13_keys.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/library/ssl_misc.h b/library/ssl_misc.h index a6439dc3e..8155fb79c 100644 --- a/library/ssl_misc.h +++ b/library/ssl_misc.h @@ -1305,7 +1305,7 @@ static inline mbedtls_svc_key_id_t mbedtls_ssl_get_opaque_psk( * \return PSA_SUCCESS on success or PSA_ERROR_NOT_SUPPORTED if * conversion is not supported. */ -psa_status_t mbedtls_cipher_to_psa( mbedtls_cipher_type_t mbedtls_cipher_type, +psa_status_t tls_mbedtls_cipher_to_psa( mbedtls_cipher_type_t mbedtls_cipher_type, size_t taglen, psa_algorithm_t *alg, psa_key_type_t *key_type, diff --git a/library/ssl_tls.c b/library/ssl_tls.c index 4266af4d3..0efdd3e3e 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -1009,14 +1009,14 @@ static int ssl_tls12_populate_transform( mbedtls_ssl_transform *transform, } #if defined(MBEDTLS_USE_PSA_CRYPTO) - if( ( status = mbedtls_cipher_to_psa( cipher_info->type, + if( ( status = tls_mbedtls_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, "mbedtls_cipher_to_psa", ret ); + MBEDTLS_SSL_DEBUG_RET( 1, "tls_mbedtls_cipher_to_psa", ret ); goto end; } @@ -4012,7 +4012,7 @@ int mbedtls_ssl_conf_psk_opaque( mbedtls_ssl_config *conf, return( ret ); } -psa_status_t mbedtls_cipher_to_psa( mbedtls_cipher_type_t mbedtls_cipher_type, +psa_status_t tls_mbedtls_cipher_to_psa( mbedtls_cipher_type_t mbedtls_cipher_type, size_t taglen, psa_algorithm_t *alg, psa_key_type_t *key_type, diff --git a/library/ssl_tls13_keys.c b/library/ssl_tls13_keys.c index a3c1fe54f..5f0595bbb 100644 --- a/library/ssl_tls13_keys.c +++ b/library/ssl_tls13_keys.c @@ -930,13 +930,13 @@ int mbedtls_ssl_tls13_populate_transform( mbedtls_ssl_transform *transform, /* * Setup psa keys and alg */ - if( ( status = mbedtls_cipher_to_psa( cipher_info->type, + if( ( status = tls_mbedtls_cipher_to_psa( cipher_info->type, transform->taglen, &alg, &key_type, &key_bits ) ) != PSA_SUCCESS ) { - MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_cipher_to_psa", psa_status_to_mbedtls( status ) ); + MBEDTLS_SSL_DEBUG_RET( 1, "tls_mbedtls_cipher_to_psa", psa_status_to_mbedtls( status ) ); return( psa_status_to_mbedtls( status ) ); }