commit cef3f330128dfe39ea6f8d88bc9f42738d41d0c7
author Jerry Yu <jerry.h.yu@arm.com> Tue Mar 22 23:00:13 2022 +0800
committer Jerry Yu <jerry.h.yu@arm.com> Tue Mar 22 23:16:42 2022 +0800
tree 6245ab754efcdccc6e2d07b066a5065c6abd12e1
parent 701656fb292bf1fed5d4663f360a0be4b1ccd219

Guard rsa sig algs with rsa_c and pkcs1_v{15,21}

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 cb9b6aa..0caaa28 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -2055,20 +2055,58 @@
           MBEDTLS_ECDSA_C */
 
 #if defined(MBEDTLS_SHA256_C) && \
-    defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT)
+    defined(MBEDTLS_PKCS1_V21) && \
+    defined(MBEDTLS_RSA_C)
             case MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA256:
                 break;
+#endif /* MBEDTLS_SHA256_C && \
+          MBEDTLS_PKCS1_V21 && \
+          MBEDTLS_RSA_C */
+
+#if defined(MBEDTLS_SHA384_C) && \
+    defined(MBEDTLS_PKCS1_V21) && \
+    defined(MBEDTLS_RSA_C)
             case MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA384:
                 break;
+#endif /* MBEDTLS_SHA384_C && \
+          MBEDTLS_PKCS1_V21 && \
+          MBEDTLS_RSA_C */
+
+#if defined(MBEDTLS_SHA512_C) && \
+    defined(MBEDTLS_PKCS1_V21) && \
+    defined(MBEDTLS_RSA_C)
             case MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA512:
                 break;
-#endif /* MBEDTLS_SHA256_C &&
-          MBEDTLS_X509_RSASSA_PSS_SUPPORT */
+#endif /* MBEDTLS_SHA512_C && \
+          MBEDTLS_PKCS1_V21 && \
+          MBEDTLS_RSA_C */
 
-#if defined(MBEDTLS_SHA256_C) && defined(MBEDTLS_RSA_C)
+#if defined(MBEDTLS_SHA256_C) && \
+    defined(MBEDTLS_PKCS1_V15) && \
+    defined(MBEDTLS_RSA_C)
             case MBEDTLS_TLS1_3_SIG_RSA_PKCS1_SHA256:
                 break;
-#endif /* MBEDTLS_SHA256_C && MBEDTLS_RSA_C*/
+#endif /* MBEDTLS_SHA256_C && \
+          MBEDTLS_PKCS1_V15 && \
+          MBEDTLS_RSA_C */
+
+#if defined(MBEDTLS_SHA384_C) && \
+    defined(MBEDTLS_PKCS1_V15) && \
+    defined(MBEDTLS_RSA_C)
+            case MBEDTLS_TLS1_3_SIG_RSA_PKCS1_SHA384:
+                break;
+#endif /* MBEDTLS_SHA384_C && \
+          MBEDTLS_PKCS1_V15 && \
+          MBEDTLS_RSA_C */
+
+#if defined(MBEDTLS_SHA512_C) && \
+    defined(MBEDTLS_PKCS1_V15) && \
+    defined(MBEDTLS_RSA_C)
+            case MBEDTLS_TLS1_3_SIG_RSA_PKCS1_SHA512:
+                break;
+#endif /* MBEDTLS_SHA384_C && \
+          MBEDTLS_PKCS1_V15 && \
+          MBEDTLS_RSA_C */
 
             default:
                 return( 0 );