commit 52b7d923fe341f15033ec92206f60d0b055a9768
author Jerry Yu <jerry.h.yu@arm.com> Fri Jul 01 18:03:31 2022 +0800
committer Jerry Yu <jerry.h.yu@arm.com> Fri Jul 01 18:12:44 2022 +0800
tree 36553927b4f3b3569c37a2af330a4285faabf35e
parent aae28f178bba674d762e72c7b8c55dbfe0d74737

fix various issues

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>

library/ssl_misc.h

diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index f788baf..77f001a 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -1984,7 +1984,7 @@
 
     switch( sig_alg )
     {
-#if defined(MBEDTLS_RSA_C)
+#if defined(MBEDTLS_PKCS1_V21)
 #if defined(MBEDTLS_SHA256_C)
         case MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA256:
             *md_alg = MBEDTLS_MD_SHA256;
@@ -2003,7 +2003,7 @@
             *pk_type = MBEDTLS_PK_RSASSA_PSS;
             break;
 #endif /* MBEDTLS_SHA512_C */
-#endif /* MBEDTLS_RSA_C */
+#endif /* MBEDTLS_PKCS1_V21 */
             default:
                 return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
         }
@@ -2031,7 +2031,7 @@
 #endif /* MBEDTLS_SHA512_C && MBEDTLS_ECP_DP_SECP521R1_ENABLED */
 #endif /* MBEDTLS_ECDSA_C */
 
-#if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
+#if defined(MBEDTLS_PKCS1_V21)
 #if defined(MBEDTLS_SHA256_C)
         case MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA256:
             break;
@@ -2044,7 +2044,7 @@
         case MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA512:
             break;
 #endif /* MBEDTLS_SHA512_C */
-#endif /* MBEDTLS_X509_RSASSA_PSS_SUPPORT */
+#endif /* MBEDTLS_PKCS1_V21 */
         default:
             return( 0 );
     }
@@ -2057,7 +2057,7 @@
 {
     switch( sig_alg )
     {
-#if defined(MBEDTLS_PKCS1_V15) && defined(MBEDTLS_RSA_C)
+#if defined(MBEDTLS_PKCS1_V15)
 #if defined(MBEDTLS_SHA256_C)
         case MBEDTLS_TLS1_3_SIG_RSA_PKCS1_SHA256:
             break;
@@ -2070,7 +2070,7 @@
         case MBEDTLS_TLS1_3_SIG_RSA_PKCS1_SHA512:
             break;
 #endif /* MBEDTLS_SHA512_C */
-#endif /* MBEDTLS_PKCS1_V15 && MBEDTLS_RSA_C */
+#endif /* MBEDTLS_PKCS1_V15 */
         default:
             return( mbedtls_ssl_tls13_sig_alg_for_cert_verify_is_supported(
                                                                     sig_alg ) );

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index c2f1f85..b40fbbb 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -4916,10 +4916,7 @@
                                     sig_alg,
                                     mbedtls_ssl_sig_alg_to_str( sig_alg ) ) );
 #if defined(MBEDTLS_SSL_PROTO_TLS1_2)
-        if(
-#if defined(MBEDTLS_SSL_PROTO_TLS1_3)
-            ssl->tls_version == MBEDTLS_SSL_VERSION_TLS1_2 &&
-#endif /* MBEDTLS_SSL_PROTO_TLS1_3 */
+        if( ssl->tls_version == MBEDTLS_SSL_VERSION_TLS1_2 &&
             ( ! ( mbedtls_ssl_sig_alg_is_supported( ssl, sig_alg ) &&
                   mbedtls_ssl_sig_alg_is_offered( ssl, sig_alg ) ) ) )
         {