yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-02-02 10:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix double check in entropy_gather_internal

Browse source 
The double check was wrong way, glitching either check
could have compromised the flow there.
This commit is contained in:
Jarno Lamsa 2019-12-19 14:46:40 +02:00
parent afff4d0679
commit f5b6af01d3
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
library/entropy.c
View file

@ -43,9 +43,7 @@
#include <stdio.h> #include <stdio.h>
#endif #endif
#if defined(MBEDTLS_ENTROPY_NV_SEED)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif
#if defined(MBEDTLS_SELF_TEST) #if defined(MBEDTLS_SELF_TEST)
#if defined(MBEDTLS_PLATFORM_C) #if defined(MBEDTLS_PLATFORM_C)
@ -274,12 +272,14 @@ static int entropy_gather_internal( mbedtls_entropy_context *ctx )
{ {
volatile int strong_fi = ctx->source[i].strong; volatile int strong_fi = ctx->source[i].strong;
if( strong_fi == MBEDTLS_ENTROPY_SOURCE_STRONG ) if( strong_fi == MBEDTLS_ENTROPY_SOURCE_STRONG )
have_one_strong_fi = 1; {
mbedtls_platform_enforce_volatile_reads();
mbedtls_platform_enforce_volatile_reads(); if( strong_fi == MBEDTLS_ENTROPY_SOURCE_STRONG )
have_one_strong_fi = 1;
if( strong_fi == MBEDTLS_ENTROPY_SOURCE_STRONG ) else
have_one_strong_fi = 1; return( MBEDTLS_ERR_PLATFORM_FAULT_DETECTED );
}
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,
@ -310,6 +310,10 @@ cleanup:
{ {
return( ret ); return( ret );
} }
else
{
return( MBEDTLS_ERR_PLATFORM_FAULT_DETECTED );
}
} }
return( MBEDTLS_ERR_ENTROPY_NO_STRONG_SOURCE ); return( MBEDTLS_ERR_ENTROPY_NO_STRONG_SOURCE );