commit 8c95ac45004a9421141e4963d5045137fd2fbfd7
author Andrzej Kurek <andrzej.kurek@arm.com> Wed Aug 17 16:17:00 2022 -0400
committer Andrzej Kurek <andrzej.kurek@arm.com> Mon Aug 22 17:46:50 2022 -0400
tree 260b9f31b784a6dae5b8396249fbb773a97fa8e1
parent 7bb8bab45740e17cd2985a48762a011ce5e30df6

Add missing dependencies / alternatives

A number of places lacked the necessary dependencies on one of
the used features: MD, key exchange with certificate, 
entropy, or ETM.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 873b2f4..361dc8b 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -7810,8 +7810,11 @@
         }
 
         if( ( transform->psa_alg == MBEDTLS_SSL_NULL_CIPHER ) ||
-            ( ( transform->psa_alg == PSA_ALG_CBC_NO_PADDING ) &&
-              ( transform->encrypt_then_mac == MBEDTLS_SSL_ETM_DISABLED ) ) )
+            ( ( transform->psa_alg == PSA_ALG_CBC_NO_PADDING )
+#if defined(MBEDTLS_SSL_SOME_SUITES_USE_CBC_ETM)
+              && ( transform->encrypt_then_mac == MBEDTLS_SSL_ETM_DISABLED )
+#endif
+            ) )
             /* mbedtls_ct_hmac() requires the key to be exportable */
             psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_EXPORT |
                                                   PSA_KEY_USAGE_VERIFY_HASH );