commit 971f30d917fe9ce34a03ca8812dce9e744269228
author Neil Armstrong <narmstrong@baylibre.com> Fri Jul 01 16:23:50 2022 +0200
committer Neil Armstrong <narmstrong@baylibre.com> Fri Jul 01 16:23:50 2022 +0200
tree af88ddb8a14d632079d0a30879a8341f46dc9718
parent c67e6e96f8fd8a656adc2d80bf27bd75123fe00b

Fix mbedtls_ssl_get_ciphersuite_sig_alg() by returning MBEDTLS_PK_NONE for MBEDTLS_KEY_EXCHANGE_RSA

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

library/ssl_ciphersuites.c

diff --git a/library/ssl_ciphersuites.c b/library/ssl_ciphersuites.c
index 9b98023..62988f2 100644
--- a/library/ssl_ciphersuites.c
+++ b/library/ssl_ciphersuites.c
@@ -1972,7 +1972,6 @@
 {
     switch( info->key_exchange )
     {
-        case MBEDTLS_KEY_EXCHANGE_RSA:
         case MBEDTLS_KEY_EXCHANGE_DHE_RSA:
         case MBEDTLS_KEY_EXCHANGE_ECDHE_RSA:
             return( MBEDTLS_PK_RSA );

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index aa4aa08..0abf2b9 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -7713,13 +7713,10 @@
                     continue;
 
                 if( sig_alg_received == MBEDTLS_SSL_SIG_RSA &&
-                    ! ( mbedtls_pk_can_do_ext( ssl->handshake->key_cert->key,
-                                               PSA_ALG_RSA_PKCS1V15_CRYPT,
-                                               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 ) ) )
+                    ! mbedtls_pk_can_do_ext( ssl->handshake->key_cert->key,
+                                             PSA_ALG_RSA_PKCS1V15_SIGN(
+                                                            psa_hash_alg ),
+                                             PSA_KEY_USAGE_SIGN_HASH ) )
                     continue;
             }
 #endif /* MBEDTLS_USE_PSA_CRYPTO */