yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-29 02:24:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/pr/2978' into baremetal

Browse Source
This commit is contained in:
Simon Butcher 2020-01-08 18:14:21 +00:00
commit 282911eabf
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configs/baremetal_test.h
View File

@ -48,7 +48,4 @@
#undef MBEDTLS_NO_PLATFORM_ENTROPY #undef MBEDTLS_NO_PLATFORM_ENTROPY
#undef MBEDTLS_ENTROPY_MAX_SOURCES
#define MBEDTLS_ENTROPY_MAX_SOURCES 3
#endif /* MBEDTLS_BAREMETAL_USER_CONFIG_H */ #endif /* MBEDTLS_BAREMETAL_USER_CONFIG_H */

6
tests/suites/helpers.function
View File

@ -32,6 +32,8 @@
#include "tinycrypt/ecc.h" #include "tinycrypt/ecc.h"
#endif /* MBEDTLS_USE_TINYCRYPT */ #endif /* MBEDTLS_USE_TINYCRYPT */
#include "mbedtls/entropy.h"
#ifdef _MSC_VER #ifdef _MSC_VER
#include <basetsd.h> #include <basetsd.h>
typedef UINT8 uint8_t; typedef UINT8 uint8_t;
@ -300,6 +302,10 @@ jmp_buf jmp_tmp;
#define ENTROPY_HAVE_STRONG #define ENTROPY_HAVE_STRONG
#endif #endif
/* Set flag if number of entropy sources is more than 2 */
#if ( MBEDTLS_ENTROPY_MAX_SOURCES > 2 )
#define ENTROPY_SOURCE_COUNT_MORE_THAN_TWO
#endif
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
/* Helper Functions */ /* Helper Functions */

4
tests/suites/test_suite_entropy.function
View File

@ -193,7 +193,7 @@ void entropy_func_len( int len, int ret )
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE */ /* BEGIN_CASE depends_on:ENTROPY_SOURCE_COUNT_MORE_THAN_TWO */
void entropy_source_fail( char * path ) void entropy_source_fail( char * path )
{ {
mbedtls_entropy_context ctx; mbedtls_entropy_context ctx;
@ -225,7 +225,7 @@ exit:
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE depends_on:ENTROPY_HAVE_STRONG */ /* BEGIN_CASE depends_on:ENTROPY_HAVE_STRONG:ENTROPY_SOURCE_COUNT_MORE_THAN_TWO */
void entropy_threshold( int threshold, int chunk_size, int result ) void entropy_threshold( int threshold, int chunk_size, int result )
{ {
mbedtls_entropy_context ctx; mbedtls_entropy_context ctx;