Revert "Move constant_flow.h into the main library"
This reverts commit fd78c34e23c95a49b0c0790b714aee7cd85335c9.
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
diff --git a/library/constant_time.c b/library/constant_time.c
index 61fb094..d4bd331 100644
--- a/library/constant_time.c
+++ b/library/constant_time.c
@@ -30,7 +30,7 @@
#include "mbedtls/error.h"
#include "mbedtls/platform_util.h"
-#include "constant_flow.h"
+#include "../tests/include/test/constant_flow.h"
#include <string.h>
diff --git a/library/constant_time_impl.h b/library/constant_time_impl.h
index 1bb07b3..b2ef73f 100644
--- a/library/constant_time_impl.h
+++ b/library/constant_time_impl.h
@@ -37,7 +37,7 @@
#include "mbedtls/bignum.h"
#endif
-#include "constant_flow.h"
+#include "../tests/include/test/constant_flow.h"
/* armcc5 --gnu defines __GNUC__ but doesn't support GNU's extended asm */
#if defined(MBEDTLS_HAVE_ASM) && defined(__GNUC__) && (!defined(__ARMCC_VERSION) || \
diff --git a/library/constant_flow.h b/tests/include/test/constant_flow.h
similarity index 100%
rename from library/constant_flow.h
rename to tests/include/test/constant_flow.h
diff --git a/tests/src/helpers.c b/tests/src/helpers.c
index 1062560..30fd362 100644
--- a/tests/src/helpers.c
+++ b/tests/src/helpers.c
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include "constant_flow.h"
+#include <test/constant_flow.h>
#include <test/helpers.h>
#include <test/macros.h>
#include <string.h>
diff --git a/tests/suites/test_suite_base64.function b/tests/suites/test_suite_base64.function
index acdfbea..e351ad8 100644
--- a/tests/suites/test_suite_base64.function
+++ b/tests/suites/test_suite_base64.function
@@ -2,7 +2,7 @@
#include "mbedtls/base64.h"
#include "base64_internal.h"
#include "constant_time_internal.h"
-#include "constant_flow.h"
+#include <test/constant_flow.h>
#if defined(MBEDTLS_TEST_HOOKS)
static const char base64_digits[] =
diff --git a/tests/suites/test_suite_bignum.function b/tests/suites/test_suite_bignum.function
index edb3695..caa7e04 100644
--- a/tests/suites/test_suite_bignum.function
+++ b/tests/suites/test_suite_bignum.function
@@ -3,7 +3,7 @@
#include "mbedtls/entropy.h"
#include "constant_time_internal.h"
#include "bignum_core.h"
-#include "constant_flow.h"
+#include "test/constant_flow.h"
#if MBEDTLS_MPI_MAX_BITS > 792
#define MPI_MAX_BITS_LARGER_THAN_792
diff --git a/tests/suites/test_suite_bignum_core.function b/tests/suites/test_suite_bignum_core.function
index 3288920..7ac03d0 100644
--- a/tests/suites/test_suite_bignum_core.function
+++ b/tests/suites/test_suite_bignum_core.function
@@ -3,7 +3,7 @@
#include "mbedtls/entropy.h"
#include "bignum_core.h"
#include "constant_time_internal.h"
-#include "constant_flow.h"
+#include "test/constant_flow.h"
/** Verifies mbedtls_mpi_core_add().
*
diff --git a/tests/suites/test_suite_bignum_mod.function b/tests/suites/test_suite_bignum_mod.function
index f166079..4edc0b9 100644
--- a/tests/suites/test_suite_bignum_mod.function
+++ b/tests/suites/test_suite_bignum_mod.function
@@ -4,7 +4,7 @@
#include "bignum_mod.h"
#include "bignum_mod_raw.h"
#include "constant_time_internal.h"
-#include "constant_flow.h"
+#include "test/constant_flow.h"
#define TEST_COMPARE_MPI_RESIDUES(a, b) \
ASSERT_COMPARE((a).p, (a).limbs * sizeof(mbedtls_mpi_uint), \
diff --git a/tests/suites/test_suite_bignum_mod_raw.function b/tests/suites/test_suite_bignum_mod_raw.function
index db4c20f..b67ac51 100644
--- a/tests/suites/test_suite_bignum_mod_raw.function
+++ b/tests/suites/test_suite_bignum_mod_raw.function
@@ -4,7 +4,7 @@
#include "bignum_core.h"
#include "bignum_mod_raw.h"
#include "constant_time_internal.h"
-#include "constant_flow.h"
+#include "test/constant_flow.h"
#include "bignum_mod_raw_invasive.h"
diff --git a/tests/suites/test_suite_constant_time.function b/tests/suites/test_suite_constant_time.function
index 330dc6f..bdd27f5 100644
--- a/tests/suites/test_suite_constant_time.function
+++ b/tests/suites/test_suite_constant_time.function
@@ -18,7 +18,7 @@
#include <mbedtls/constant_time.h>
#include <constant_time_internal.h>
-#include "constant_flow.h"
+#include <test/constant_flow.h>
/* END_HEADER */
/* BEGIN_CASE */
diff --git a/tests/suites/test_suite_constant_time_hmac.function b/tests/suites/test_suite_constant_time_hmac.function
index b7cfb66..902acfa 100644
--- a/tests/suites/test_suite_constant_time_hmac.function
+++ b/tests/suites/test_suite_constant_time_hmac.function
@@ -5,7 +5,7 @@
#include <constant_time_internal.h>
#include "md_psa.h"
-#include "constant_flow.h"
+#include <test/constant_flow.h>
/* END_HEADER */
/* BEGIN_CASE depends_on:MBEDTLS_SSL_SOME_SUITES_USE_MAC:MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC:MBEDTLS_TEST_HOOKS */
diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index eadf715..a8c714f 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -8,7 +8,7 @@
#include <test/ssl_helpers.h>
#include <constant_time_internal.h>
-#include "constant_flow.h"
+#include <test/constant_flow.h>
#define SSL_MESSAGE_QUEUE_INIT { NULL, 0, 0, 0 }