lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-06-06 11:40:59 +03:00
Code

Guard new code with MBEDTLS_USE_PSA_CRYPTO

Browse Source 
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemek Stekiel 2022-07-05 22:42:44 +02:00 committed by Ronald Cron
parent 3c326f9697
commit f937e669bd
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/ssl_tls13_generic.c
View File

@ -927,6 +927,7 @@ int mbedtls_ssl_tls13_check_sig_alg_cert_key_match( uint16_t sig_alg,
return( 0 ); return( 0 );
} }
#if defined(MBEDTLS_USE_PSA_CRYPTO)
static psa_algorithm_t ssl_tls13_select_sig_alg_to_psa_alg( uint16_t sig_alg ) static psa_algorithm_t ssl_tls13_select_sig_alg_to_psa_alg( uint16_t sig_alg )
{ {
psa_algorithm_t psa_alg = 0; psa_algorithm_t psa_alg = 0;
@ -960,6 +961,7 @@ static psa_algorithm_t ssl_tls13_select_sig_alg_to_psa_alg( uint16_t sig_alg )
} }
return( psa_alg ); return( psa_alg );
} }
#endif /* MBEDTLS_USE_PSA_CRYPTO */
MBEDTLS_CHECK_RETURN_CRITICAL MBEDTLS_CHECK_RETURN_CRITICAL
static int ssl_tls13_select_sig_alg_for_certificate_verify( static int ssl_tls13_select_sig_alg_for_certificate_verify(
@ -968,19 +970,26 @@ static int ssl_tls13_select_sig_alg_for_certificate_verify(
uint16_t *algorithm ) uint16_t *algorithm )
{ {
uint16_t *sig_alg = ssl->handshake->received_sig_algs; uint16_t *sig_alg = ssl->handshake->received_sig_algs;
#if defined(MBEDTLS_USE_PSA_CRYPTO)
psa_algorithm_t psa_alg = 0; psa_algorithm_t psa_alg = 0;
#endif /* MBEDTLS_USE_PSA_CRYPTO */
*algorithm = MBEDTLS_TLS1_3_SIG_NONE; *algorithm = MBEDTLS_TLS1_3_SIG_NONE;
for( ; *sig_alg != MBEDTLS_TLS1_3_SIG_NONE ; sig_alg++ ) for( ; *sig_alg != MBEDTLS_TLS1_3_SIG_NONE ; sig_alg++ )
{ {
#if defined(MBEDTLS_USE_PSA_CRYPTO)
psa_alg = ssl_tls13_select_sig_alg_to_psa_alg( *sig_alg ); psa_alg = ssl_tls13_select_sig_alg_to_psa_alg( *sig_alg );
#endif /* MBEDTLS_USE_PSA_CRYPTO */
if( mbedtls_ssl_sig_alg_is_offered( ssl, *sig_alg ) && if( mbedtls_ssl_sig_alg_is_offered( ssl, *sig_alg ) &&
mbedtls_ssl_tls13_sig_alg_for_cert_verify_is_supported( *sig_alg ) && mbedtls_ssl_tls13_sig_alg_for_cert_verify_is_supported( *sig_alg ) &&
mbedtls_ssl_tls13_check_sig_alg_cert_key_match( *sig_alg, own_key ) && mbedtls_ssl_tls13_check_sig_alg_cert_key_match( *sig_alg, own_key )
psa_alg != 0 && #if defined(MBEDTLS_USE_PSA_CRYPTO)
&& psa_alg != 0 &&
mbedtls_pk_can_do_ext( own_key, psa_alg, mbedtls_pk_can_do_ext( own_key, psa_alg,
PSA_KEY_USAGE_SIGN_HASH ) == 1 ) PSA_KEY_USAGE_SIGN_HASH ) == 1
#endif /* MBEDTLS_USE_PSA_CRYPTO */
)
{ {
MBEDTLS_SSL_DEBUG_MSG( 3, MBEDTLS_SSL_DEBUG_MSG( 3,
( "select_sig_alg_for_certificate_verify:" ( "select_sig_alg_for_certificate_verify:"