lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

Merge branch 'pr_1025' into development

Browse Source 
Merge PR #1025 + ChangeLog entry
This commit is contained in:
Gilles Peskine
2017-11-28 18:23:53 +01:00
parent ea8d697fa2 d742b74838
commit 4daffe236a
8 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/suites/helpers.function
View File

@ -110,6 +110,21 @@ static struct
test_info;
/*----------------------------------------------------------------------------*/
/* 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 ENTROPY_HAVE_STRONG
#endif
/*----------------------------------------------------------------------------*/
/* Helper Functions */
@ -408,4 +423,3 @@ static void test_fail( const char *test, int line_no, const char* filename )
test_info.line_no = line_no;
test_info.filename = filename;
}