espressif/mbedtls
1
0
Fork 0
mirror of https://github.com/espressif/mbedtls.git synced 2025-05-10 03:39:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix mbedtls_ssl_get_ciphersuite_sig_alg() by returning MBEDTLS_PK_NONE for MBEDTLS_KEY_EXCHANGE_RSA

Browse Source 
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
This commit is contained in:
Neil Armstrong 2022-07-01 16:23:50 +02:00
parent c67e6e96f8
commit 971f30d917
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/ssl_ciphersuites.c
View File

@ -1972,7 +1972,6 @@ mbedtls_pk_type_t mbedtls_ssl_get_ciphersuite_sig_alg( const mbedtls_ssl_ciphers
{ {
switch( info->key_exchange ) switch( info->key_exchange )
{ {
case MBEDTLS_KEY_EXCHANGE_RSA:
case MBEDTLS_KEY_EXCHANGE_DHE_RSA: case MBEDTLS_KEY_EXCHANGE_DHE_RSA:
case MBEDTLS_KEY_EXCHANGE_ECDHE_RSA: case MBEDTLS_KEY_EXCHANGE_ECDHE_RSA:
return( MBEDTLS_PK_RSA ); return( MBEDTLS_PK_RSA );

11
library/ssl_tls.c
View File

@ -7713,13 +7713,10 @@ unsigned int mbedtls_ssl_tls12_get_preferred_hash_for_sig_alg(
continue; continue;
if( sig_alg_received == MBEDTLS_SSL_SIG_RSA && if( sig_alg_received == MBEDTLS_SSL_SIG_RSA &&
! ( 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, PSA_ALG_RSA_PKCS1V15_SIGN(
PSA_KEY_USAGE_DECRYPT ) || psa_hash_alg ),
mbedtls_pk_can_do_ext( ssl->handshake->key_cert->key, PSA_KEY_USAGE_SIGN_HASH ) )
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 */