yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refine mbedtls_ssl_tls12_get_preferred_hash_for_sig_alg() when USE_PSA_CRYPTO is selected

Browse source 
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
This commit is contained in:
Neil Armstrong 2022-06-30 18:05:05 +02:00
parent 167d82c4df
commit 96eceb8022
1 changed files with 15 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
library/ssl_tls.c
View file

@ -7703,39 +7703,27 @@ unsigned int mbedtls_ssl_tls12_get_preferred_hash_for_sig_alg(
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
if( ssl->handshake->key_cert && ssl->handshake->key_cert->key ) if( ssl->handshake->key_cert && ssl->handshake->key_cert->key )
{ {
psa_algorithm_t alg = PSA_ALG_NONE; psa_algorithm_t psa_hash_alg =
psa_algorithm_t alg2 = PSA_ALG_NONE; mbedtls_psa_translate_md( hash_alg_received );
psa_key_usage_t usage = 0;
psa_key_usage_t usage2 = 0;
if( sig_alg_received == MBEDTLS_SSL_SIG_ECDSA ) if( sig_alg_received == MBEDTLS_SSL_SIG_ECDSA &&
{ ! mbedtls_pk_can_do_ext( ssl->handshake->key_cert->key,
PSA_ALG_ECDSA( psa_hash_alg ),
alg = PSA_ALG_ECDSA( PSA_KEY_USAGE_SIGN_HASH ) )
mbedtls_psa_translate_md( hash_alg_received ) );
usage = PSA_KEY_USAGE_SIGN_HASH;
alg2 = PSA_ALG_ECDH;
usage2 = PSA_KEY_USAGE_DERIVE;
}
else if( sig_alg_received == MBEDTLS_SSL_SIG_RSA )
{
alg = PSA_ALG_RSA_PKCS1V15_SIGN(
mbedtls_psa_translate_md( hash_alg_received ) );
usage = PSA_KEY_USAGE_SIGN_HASH;
alg2 = PSA_ALG_RSA_PKCS1V15_CRYPT;
usage2 = PSA_KEY_USAGE_DECRYPT;
}
else
continue; continue;
if( ! mbedtls_pk_can_do_ext( ssl->handshake->key_cert->key, if( sig_alg_received == MBEDTLS_SSL_SIG_RSA &&
alg, usage ) && ! ( mbedtls_pk_can_do_ext( ssl->handshake->key_cert->key,
! mbedtls_pk_can_do_ext( ssl->handshake->key_cert->key, PSA_ALG_RSA_PKCS1V15_CRYPT,
alg2, usage2 ) ) PSA_KEY_USAGE_DECRYPT ) ||
mbedtls_pk_can_do_ext( ssl->handshake->key_cert->key,
PSA_ALG_RSA_PKCS1V15_SIGN(
psa_hash_alg ),
PSA_KEY_USAGE_SIGN_HASH ) ) )
continue; continue;
} }
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #endif /* MBEDTLS_USE_PSA_CRYPTO */
return( hash_alg_received ); return( hash_alg_received );
} }
} }