mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-01-26 12:35:20 +00:00
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>
This commit is contained in:
parent
1d714479a3
commit
f57b45660d
@ -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 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,
|
||||
|
@ -1009,14 +1009,14 @@ static int ssl_tls12_populate_transform( mbedtls_ssl_transform *transform,
|
||||
}
|
||||
|
||||
#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 @@ int mbedtls_ssl_conf_psk_opaque( mbedtls_ssl_config *conf,
|
||||
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,
|
||||
|
@ -930,13 +930,13 @@ int mbedtls_ssl_tls13_populate_transform( mbedtls_ssl_transform *transform,
|
||||
/*
|
||||
* 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 ) );
|
||||
}
|
||||
|
||||
|
@ -1431,7 +1431,7 @@ static int build_transforms( mbedtls_ssl_transform *t_in,
|
||||
#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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user