From d2cc7ce4cb3303a113e57bfed062188fe6466fdc Mon Sep 17 00:00:00 2001
From: Hanno Becker <hanno.becker@arm.com>
Date: Fri, 8 Sep 2017 10:47:33 +0100
Subject: [PATCH] Correct definition of ENTROPY_HAVE_STRONG

Mbed TLS 2.1 doesn't have MBEDTLS_TEST_NULL_ENTROPY macro.
---
 tests/suites/helpers.function | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/suites/helpers.function b/tests/suites/helpers.function
index b80831ee50..5c20f81ca0 100644
--- a/tests/suites/helpers.function
+++ b/tests/suites/helpers.function
@@ -59,11 +59,10 @@ typedef UINT32 uint32_t;
 
 /* 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) ) )
+#if !defined(MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES) &&     \
+    ( !defined(MBEDTLS_NO_PLATFORM_ENTROPY)  ||         \
+       defined(MBEDTLS_HAVEGE_C)             ||         \
+       defined(MBEDTLS_ENTROPY_HARDWARE_ALT) )
 #define ENTROPY_HAVE_STRONG
 #endif