commit c84bd24224c8e0f058fb9fb797a849e06dac9be5
author Jarno Lamsa <jarno.lamsa@arm.com> Fri Aug 16 12:06:56 2019 +0300
committer Jarno Lamsa <jarno.lamsa@arm.com> Fri Aug 23 13:11:31 2019 +0300
tree 4cf1c9fa5f1702ad9ca824fdfd5010cde50887f9
parent e458869b3fa94468f3babb702e9c533d0ec03806

Add missing guards for mac usage

There were couple of cases where guards were missing when
no ciphersuites are using mac.

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 138e1da..930613b 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1008,12 +1008,14 @@
 static int ssl_populate_transform( mbedtls_ssl_transform *transform,
                                    int ciphersuite,
                                    const unsigned char master[48],
+#if defined(MBEDTLS_SSL_SOME_MODES_USE_MAC)
 #if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC)
                                    int encrypt_then_mac,
-#endif
+#endif /* MBEDTLS_SSL_ENCRYPT_THEN_MAC */
 #if defined(MBEDTLS_SSL_TRUNCATED_HMAC)
                                    int trunc_hmac,
-#endif
+#endif /* MBEDTLS_SSL_TRUNCATED_HMAC */
+#endif /* MBEDTLS_SSL_SOME_MODES_USE_MAC */
 #if defined(MBEDTLS_ZLIB_SUPPORT)
                                    int compression,
 #endif
@@ -1784,12 +1786,14 @@
     ret = ssl_populate_transform( ssl->transform_negotiate,
                                   ssl->session_negotiate->ciphersuite,
                                   ssl->session_negotiate->master,
+#if defined(MBEDTLS_SSL_SOME_MODES_USE_MAC)
 #if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC)
                                   ssl->session_negotiate->encrypt_then_mac,
-#endif
+#endif /* MBEDTLS_SSL_ENCRYPT_THEN_MAC */
 #if defined(MBEDTLS_SSL_TRUNCATED_HMAC)
                                   ssl->session_negotiate->trunc_hmac,
-#endif
+#endif /* MBEDTLS_SSL_TRUNCATED_HMAC */
+#endif /* MBEDTLS_SSL_SOME_MODES_USE_MAC */
 #if defined(MBEDTLS_ZLIB_SUPPORT)
                                   ssl->session_negotiate->compression,
 #endif