commit ed0e86428d166d1cf6bc06b5b19a530f7e8dbc97
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue Jul 21 11:20:30 2020 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Wed Jul 22 11:31:19 2020 +0200
tree 6fbf1cf0fbec559ad6550f51c14463062f825b42
parent 7a8b1e6b7136702941b6da5fe75ca4673f402130

Factor repeated condition to its own macro

Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>

library/ssl_invasive.h

diff --git a/library/ssl_invasive.h b/library/ssl_invasive.h
index f40f0d4..49ee83f 100644
--- a/library/ssl_invasive.h
+++ b/library/ssl_invasive.h
@@ -32,10 +32,7 @@
 #include "mbedtls/md.h"
 
 #if defined(MBEDTLS_TEST_HOOKS) &&              \
-    defined(MBEDTLS_SSL_SOME_SUITES_USE_CBC) && \
-    ( defined(MBEDTLS_SSL_PROTO_TLS1) ||        \
-      defined(MBEDTLS_SSL_PROTO_TLS1_1) |       \
-      defined(MBEDTLS_SSL_PROTO_TLS1_2) )
+    defined(MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC)
 /** \brief Compute the HMAC of variable-length data with constant flow.
  *
  * This function computes the HMAC of the concatenation of \p add_data and \p
@@ -74,6 +71,6 @@
         const unsigned char *data, size_t data_len_secret,
         size_t min_data_len, size_t max_data_len,
         unsigned char *output );
-#endif /* MBEDTLS_TEST_HOOKS && MBEDTLS_SSL_SOME_SUITES_USE_CBC && TLS 1.0-1.2 */
+#endif /* MBEDTLS_TEST_HOOKS && MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC */
 
 #endif /* MBEDTLS_SSL_INVASIVE_H */

library/ssl_msg.c

diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index 9b4d1db..086db88 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -1066,10 +1066,7 @@
     return( 0 );
 }
 
-#if defined(MBEDTLS_SSL_SOME_SUITES_USE_CBC) && \
-    ( defined(MBEDTLS_SSL_PROTO_TLS1) ||        \
-      defined(MBEDTLS_SSL_PROTO_TLS1_1) ||      \
-      defined(MBEDTLS_SSL_PROTO_TLS1_2) )
+#if defined(MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC)
 /*
  * Constant-flow conditional memcpy:
  *  - if c1 == c2, equivalent to memcpy(dst, src, len),
@@ -1182,7 +1179,7 @@
     mbedtls_md_free( &aux );
     return( 0 );
 }
-#endif /* MBEDTLS_SSL_SOME_SUITES_USE_CBC && TLS 1.0-1.2 */
+#endif /* MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC */
 
 int mbedtls_ssl_decrypt_buf( mbedtls_ssl_context const *ssl,
                              mbedtls_ssl_transform *transform,