From 47deec488f8da931ee82961d47c5e6eb9ffb94c4 Mon Sep 17 00:00:00 2001
From: Hanno Becker <hanno.becker@arm.com>
Date: Mon, 24 Jul 2017 12:27:09 +0100
Subject: [PATCH] Move flag indicating presence of strong entropy to test code

---
 include/mbedtls/entropy.h                | 10 ----------
 library/entropy.c                        |  4 ++--
 tests/suites/helpers.function            | 16 +++++++++++++++-
 tests/suites/test_suite_entropy.data     |  8 ++------
 tests/suites/test_suite_entropy.function |  6 +++---
 tests/suites/test_suite_rsa.function     |  1 +
 6 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/include/mbedtls/entropy.h b/include/mbedtls/entropy.h
index b374b34ec..747aca4df 100644
--- a/include/mbedtls/entropy.h
+++ b/include/mbedtls/entropy.h
@@ -55,16 +55,6 @@
 #define MBEDTLS_ERR_ENTROPY_NO_STRONG_SOURCE              -0x003D  /**< No strong sources have been added to poll. */
 #define MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR                 -0x003F  /**< Read/write error in file. */
 
-/* Indicates whether at least one standard strong entropy source is enabled. */
-#if defined(MBEDTLS_TEST_NULL_ENTROPY) ||             \
-    ( !defined(MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES) && \
-      ( !defined(MBEDTLS_NO_PLATFORM_ENTROPY)  ||     \
-         defined(MBEDTLS_HAVEGE_C)             ||     \
-         defined(MBEDTLS_ENTROPY_HARDWARE_ALT) ||     \
-         defined(ENTROPY_NV_SEED) ) )
-#define MBEDTLS_ENTROPY_HAVE_STRONG
-#endif
-
 /**
  * \name SECTION: Module settings
  *
diff --git a/library/entropy.c b/library/entropy.c
index 4de168250..10449b8d0 100644
--- a/library/entropy.c
+++ b/library/entropy.c
@@ -83,8 +83,8 @@ void mbedtls_entropy_init( mbedtls_entropy_context *ctx )
     mbedtls_havege_init( &ctx->havege_data );
 #endif
 
-    /* Reminder: Update MBEDTLS_ENTROPY_HAVE_STRONG when
-     *           adding more strong entropy sources here. */
+    /* Reminder: Update MBEDTLS_ENTROPY_HAVE_STRONG in the test files
+     *           when adding more strong entropy sources here. */
 
 #if defined(MBEDTLS_TEST_NULL_ENTROPY)
     mbedtls_entropy_add_source( ctx, mbedtls_null_entropy_poll, NULL,
diff --git a/tests/suites/helpers.function b/tests/suites/helpers.function
index 63815df85..39cd3c768 100644
--- a/tests/suites/helpers.function
+++ b/tests/suites/helpers.function
@@ -102,6 +102,21 @@ typedef UINT32 uint32_t;
 static int test_errors = 0;
 
 
+/*----------------------------------------------------------------------------*/
+/* Helper flags for complex dependencies */
+
+/* Indicates whether we expect mbedtls_entropy_init
+ * to initialize some strong entropy source. */
+#if defined(MBEDTLS_TEST_NULL_ENTROPY) ||             \
+    ( !defined(MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES) && \
+      ( !defined(MBEDTLS_NO_PLATFORM_ENTROPY)  ||     \
+         defined(MBEDTLS_HAVEGE_C)             ||     \
+         defined(MBEDTLS_ENTROPY_HARDWARE_ALT) ||     \
+         defined(ENTROPY_NV_SEED) ) )
+#define MBEDTLS_ENTROPY_HAVE_STRONG
+#endif
+
+
 /*----------------------------------------------------------------------------*/
 /* Helper Functions */
 
@@ -401,4 +416,3 @@ static void test_fail( const char *test, int line_no, const char* filename )
     mbedtls_fprintf( stdout, "  %s\n  at line %d, %s\n", test, line_no,
                         filename );
 }
-
diff --git a/tests/suites/test_suite_entropy.data b/tests/suites/test_suite_entropy.data
index bf9ce49ed..5cff39984 100644
--- a/tests/suites/test_suite_entropy.data
+++ b/tests/suites/test_suite_entropy.data
@@ -52,14 +52,10 @@ entropy_nv_seed:"000000000000000000000000000000000000000000000000000000000000000
 Check NV seed manually #3
 entropy_nv_seed:"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
 
-Entropy self test (with strong entropy)
-depends_on:!MBEDTLS_TEST_NULL_ENTROPY:MBEDTLS_ENTROPY_HAVE_STRONG
+Entropy self test
+depends_on:!MBEDTLS_TEST_NULL_ENTROPY
 entropy_selftest:0
 
-Entropy self test (without strong entropy)
-depends_on:!MBEDTLS_TEST_NULL_ENTROPY:!MBEDTLS_ENTROPY_HAVE_STRONG
-entropy_selftest:1
-
 Entropy self test (MBEDTLS_TEST_NULL_ENTROPY)
 depends_on:MBEDTLS_TEST_NULL_ENTROPY
 entropy_selftest:1
diff --git a/tests/suites/test_suite_entropy.function b/tests/suites/test_suite_entropy.function
index 97a21bc18..7983c767e 100644
--- a/tests/suites/test_suite_entropy.function
+++ b/tests/suites/test_suite_entropy.function
@@ -163,7 +163,7 @@ exit:
 }
 /* END_CASE */
 
-/* BEGIN_CASE */
+/* BEGIN_CASE depends_on:MBEDTLS_ENTROPY_HAVE_STRONG */
 void entropy_func_len( int len, int ret )
 {
     mbedtls_entropy_context ctx;
@@ -224,7 +224,7 @@ exit:
 }
 /* END_CASE */
 
-/* BEGIN_CASE */
+/* BEGIN_CASE depends_on:MBEDTLS_ENTROPY_HAVE_STRONG */
 void entropy_threshold( int threshold, int chunk_size, int result )
 {
     mbedtls_entropy_context ctx;
@@ -377,7 +377,7 @@ void entropy_nv_seed( char *read_seed_str )
 }
 /* END_CASE */
 
-/* BEGIN_CASE depends_on:MBEDTLS_SELF_TEST */
+/* BEGIN_CASE depends_on:MBEDTLS_ENTROPY_HAVE_STRONG:MBEDTLS_SELF_TEST */
 void entropy_selftest( int result )
 {
     TEST_ASSERT( mbedtls_entropy_self_test( 1 ) == result );
diff --git a/tests/suites/test_suite_rsa.function b/tests/suites/test_suite_rsa.function
index f64e1a73a..f41b14cc3 100644
--- a/tests/suites/test_suite_rsa.function
+++ b/tests/suites/test_suite_rsa.function
@@ -8,6 +8,7 @@
 #include "mbedtls/sha512.h"
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
+
 /* END_HEADER */
 
 /* BEGIN_DEPENDENCIES