eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use MBEDTLS_ENTROPY_HARDWARE_ALT

Browse source 
Use MBEDTLS_ENTROPY_HARDWARE_ALT instead of a new global RNG
flag. When this flag is enabled, the platform provides the RNG.
When running unit tests, rnd_std_rand should be used by overriding
the mbedtls_hardware_poll.
This commit is contained in:
Jarno Lamsa 2019-10-03 11:06:35 +03:00
parent 51f65e4b86
commit e29e8a49b8
3 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/mbedtls/config.h
View file

@ -3683,14 +3683,6 @@
*/ */
//#define MBEDTLS_PLATFORM_GMTIME_R_ALT //#define MBEDTLS_PLATFORM_GMTIME_R_ALT
/**
* Uncomment the macro to let Mbed TLS use a platform implementation of
* global RNG.
*
* By default the global RNG function will be a no-op.
*/
//#define MBEDTLS_PLATFORM_GLOBAL_RNG
/* \} name SECTION: Customisation configuration options */ /* \} name SECTION: Customisation configuration options */
/** /**

15
library/platform_util.c
View file

@ -38,6 +38,10 @@
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#include "mbedtls/threading.h" #include "mbedtls/threading.h"
#if defined(MBEDTLS_ENTROPY_HARDWARE_ALT)
#include "mbedtls/entropy_poll.h"
#endif
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
@ -135,13 +139,20 @@ int mbedtls_platform_memcmp( const void *buf1, const void *buf2, size_t num )
return( diff ); return( diff );
} }
#if !defined(MBEDTLS_PLATFORM_GLOBAL_RNG)
uint32_t mbedtls_platform_random_in_range( size_t num ) uint32_t mbedtls_platform_random_in_range( size_t num )
{ {
#if !defined(MBEDTLS_ENTROPY_HARDWARE_ALT)
(void) num; (void) num;
return 0; return 0;
#else
uint32_t result = 0;
size_t olen = 0;
mbedtls_hardware_poll( NULL, (unsigned char *) &result, sizeof( result ),
&olen );
return( result % num );
#endif
} }
#endif /* !MBEDTLS_PLATFORM_GLOBAL_RNG */
#if defined(MBEDTLS_HAVE_TIME_DATE) && !defined(MBEDTLS_PLATFORM_GMTIME_R_ALT) #if defined(MBEDTLS_HAVE_TIME_DATE) && !defined(MBEDTLS_PLATFORM_GMTIME_R_ALT)
#include <time.h> #include <time.h>

8
programs/ssl/query_config.c
View file

@ -2666,14 +2666,6 @@ int query_config( const char *config )
} }
#endif /* MBEDTLS_PLATFORM_GMTIME_R_ALT */ #endif /* MBEDTLS_PLATFORM_GMTIME_R_ALT */
#if defined(MBEDTLS_PLATFORM_GLOBAL_RNG)
if( strcmp( "MBEDTLS_PLATFORM_GLOBAL_RNG", config ) == 0 )
{
MACRO_EXPANSION_TO_STR( MBEDTLS_PLATFORM_GLOBAL_RNG );
return( 0 );
}
#endif /* MBEDTLS_PLATFORM_GLOBAL_RNG */
#if defined(MBEDTLS_SSL_CONF_ALLOW_LEGACY_RENEGOTIATION) #if defined(MBEDTLS_SSL_CONF_ALLOW_LEGACY_RENEGOTIATION)
if( strcmp( "MBEDTLS_SSL_CONF_ALLOW_LEGACY_RENEGOTIATION", config ) == 0 ) if( strcmp( "MBEDTLS_SSL_CONF_ALLOW_LEGACY_RENEGOTIATION", config ) == 0 )
{ {