mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-25 09:15:42 +01:00
Merge remote-tracking branch 'public/pr/2978' into baremetal
This commit is contained in:
commit
282911eabf
@ -48,7 +48,4 @@
|
||||
|
||||
#undef MBEDTLS_NO_PLATFORM_ENTROPY
|
||||
|
||||
#undef MBEDTLS_ENTROPY_MAX_SOURCES
|
||||
#define MBEDTLS_ENTROPY_MAX_SOURCES 3
|
||||
|
||||
#endif /* MBEDTLS_BAREMETAL_USER_CONFIG_H */
|
||||
|
@ -32,6 +32,8 @@
|
||||
#include "tinycrypt/ecc.h"
|
||||
#endif /* MBEDTLS_USE_TINYCRYPT */
|
||||
|
||||
#include "mbedtls/entropy.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#include <basetsd.h>
|
||||
typedef UINT8 uint8_t;
|
||||
@ -300,6 +302,10 @@ jmp_buf jmp_tmp;
|
||||
#define ENTROPY_HAVE_STRONG
|
||||
#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 */
|
||||
|
@ -193,7 +193,7 @@ void entropy_func_len( int len, int ret )
|
||||
}
|
||||
/* END_CASE */
|
||||
|
||||
/* BEGIN_CASE */
|
||||
/* BEGIN_CASE depends_on:ENTROPY_SOURCE_COUNT_MORE_THAN_TWO */
|
||||
void entropy_source_fail( char * path )
|
||||
{
|
||||
mbedtls_entropy_context ctx;
|
||||
@ -225,7 +225,7 @@ exit:
|
||||
}
|
||||
/* 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 )
|
||||
{
|
||||
mbedtls_entropy_context ctx;
|
||||
|
Loading…
Reference in New Issue
Block a user