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

Add double check to entropy-loop

Browse source 
To prevent glitching and going through without strong source
This commit is contained in:
Jarno Lamsa 2019-11-14 10:05:36 +02:00
parent 4708d66af5
commit 552e8f2d6a
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
library/entropy.c
View file

@ -258,7 +258,8 @@ int mbedtls_entropy_update_manual( mbedtls_entropy_context *ctx,
*/ */
static int entropy_gather_internal( mbedtls_entropy_context *ctx ) static int entropy_gather_internal( mbedtls_entropy_context *ctx )
{ {
int ret, i, have_one_strong = 0; int ret, i;
volatile int have_one_strong_fi = 0;
unsigned char buf[MBEDTLS_ENTROPY_MAX_GATHER]; unsigned char buf[MBEDTLS_ENTROPY_MAX_GATHER];
size_t olen; size_t olen;
@ -271,7 +272,7 @@ static int entropy_gather_internal( mbedtls_entropy_context *ctx )
for( i = 0; i < ctx->source_count; i++ ) for( i = 0; i < ctx->source_count; i++ )
{ {
if( ctx->source[i].strong == MBEDTLS_ENTROPY_SOURCE_STRONG ) if( ctx->source[i].strong == MBEDTLS_ENTROPY_SOURCE_STRONG )
have_one_strong = 1; have_one_strong_fi = 1;
olen = 0; olen = 0;
if( ( ret = ctx->source[i].f_source( ctx->source[i].p_source, if( ( ret = ctx->source[i].f_source( ctx->source[i].p_source,
@ -292,8 +293,14 @@ static int entropy_gather_internal( mbedtls_entropy_context *ctx )
} }
} }
if( have_one_strong == 0 ) if( have_one_strong_fi == 0 )
{
mbedtls_platform_enforce_volatile_reads();
if( have_one_strong_fi == 0)
{
ret = MBEDTLS_ERR_ENTROPY_NO_STRONG_SOURCE; ret = MBEDTLS_ERR_ENTROPY_NO_STRONG_SOURCE;
}
}
cleanup: cleanup:
mbedtls_platform_zeroize( buf, sizeof( buf ) ); mbedtls_platform_zeroize( buf, sizeof( buf ) );