mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-10 15:40:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename: mbedtls_cipher_to_psa -> tls_mbedtls_cipher_to_psa

Browse Source 
Signed-off-by: Przemyslaw Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemyslaw Stekiel 2022-01-19 16:09:58 +01:00
parent 6be9cf542f
commit 9b22c2b1e6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/ssl_misc.h
View File

@ -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 * \return PSA_SUCCESS on success or PSA_ERROR_NOT_SUPPORTED if
* conversion is not supported. * 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, size_t taglen,
psa_algorithm_t *alg, psa_algorithm_t *alg,
psa_key_type_t *key_type, psa_key_type_t *key_type,

6
library/ssl_tls.c
View File

@ -1009,14 +1009,14 @@ static int ssl_tls12_populate_transform( mbedtls_ssl_transform *transform,
} }
#if defined(MBEDTLS_USE_PSA_CRYPTO) #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, transform->taglen,
&alg, &alg,
&key_type, &key_type,
&key_bits ) ) != PSA_SUCCESS ) &key_bits ) ) != PSA_SUCCESS )
{ {
ret = psa_status_to_mbedtls( status ); 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; goto end;
} }
@ -4012,7 +4012,7 @@ int mbedtls_ssl_conf_psk_opaque( mbedtls_ssl_config *conf,
return( ret ); 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, size_t taglen,
psa_algorithm_t *alg, psa_algorithm_t *alg,
psa_key_type_t *key_type, psa_key_type_t *key_type,

4
library/ssl_tls13_keys.c
View File

@ -930,13 +930,13 @@ int mbedtls_ssl_tls13_populate_transform( mbedtls_ssl_transform *transform,
/* /*
* Setup psa keys and alg * 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, transform->taglen,
&alg, &alg,
&key_type, &key_type,
&key_bits ) ) != PSA_SUCCESS ) &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 ) ); return( psa_status_to_mbedtls( status ) );
} }