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

Style fixes

Browse Source
This commit is contained in:
Philippe Antoine 2019-06-07 15:04:32 +02:00
parent aa4d15264a
commit 986b6f20a9
2 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
programs/ssl/ssl_client2.c
View File

@ -553,8 +553,9 @@ int dummy_random( void *p_rng, unsigned char *output, size_t output_len )
size_t i; size_t i;
//use mbedtls_ctr_drbg_random to find bugs in it //use mbedtls_ctr_drbg_random to find bugs in it
ret = mbedtls_ctr_drbg_random(p_rng, output, output_len); ret = mbedtls_ctr_drbg_random( p_rng, output, output_len );
for (i=0; i<output_len; i++) { for ( i = 0; i < output_len; i++ )
{
//replace result with pseudo random //replace result with pseudo random
output[i] = (unsigned char) rand(); output[i] = (unsigned char) rand();
} }
@ -566,10 +567,9 @@ int dummy_entropy( void *data, unsigned char *output, size_t len )
size_t i; size_t i;
(void) data; (void) data;
//use mbedtls_entropy_func to find bugs in it //ret = mbedtls_entropy_func( data, output, len );
//test performance impact of entropy for ( i = 0; i < len; i++ )
//ret = mbedtls_entropy_func(data, output, len); {
for (i=0; i<len; i++) {
//replace result with pseudo random //replace result with pseudo random
output[i] = (unsigned char) rand(); output[i] = (unsigned char) rand();
} }
@ -1706,22 +1706,25 @@ int main( int argc, char *argv[] )
fflush( stdout ); fflush( stdout );
mbedtls_entropy_init( &entropy ); mbedtls_entropy_init( &entropy );
if (opt.reproducible) { if (opt.reproducible)
{
if( ( ret = mbedtls_ctr_drbg_seed( &ctr_drbg, dummy_entropy, if( ( ret = mbedtls_ctr_drbg_seed( &ctr_drbg, dummy_entropy,
&entropy, (const unsigned char *) pers, &entropy, (const unsigned char *) pers,
strlen( pers ) ) ) != 0 ) strlen( pers ) ) ) != 0 )
{ {
mbedtls_printf( " failed\n ! mbedtls_ctr_drbg_seed returned -0x%x\n", mbedtls_printf( " failed\n ! mbedtls_ctr_drbg_seed returned -0x%x\n",
-ret ); -ret );
goto exit; goto exit;
} }
} else { }
else
{
if( ( ret = mbedtls_ctr_drbg_seed( &ctr_drbg, mbedtls_entropy_func, if( ( ret = mbedtls_ctr_drbg_seed( &ctr_drbg, mbedtls_entropy_func,
&entropy, (const unsigned char *) pers, &entropy, (const unsigned char *) pers,
strlen( pers ) ) ) != 0 ) strlen( pers ) ) ) != 0 )
{ {
mbedtls_printf( " failed\n ! mbedtls_ctr_drbg_seed returned -0x%x\n", mbedtls_printf( " failed\n ! mbedtls_ctr_drbg_seed returned -0x%x\n",
-ret ); -ret );
goto exit; goto exit;
} }
} }
@ -2003,15 +2006,18 @@ int main( int argc, char *argv[] )
} }
#endif #endif
if (opt.reproducible) { if (opt.reproducible)
srand(1); {
srand( 1 );
mbedtls_ssl_conf_rng( &conf, dummy_random, &ctr_drbg ); mbedtls_ssl_conf_rng( &conf, dummy_random, &ctr_drbg );
#if defined(MBEDTLS_PLATFORM_TIME_ALT) #if defined(MBEDTLS_PLATFORM_TIME_ALT)
mbedtls_platform_set_time( dummy_constant_time ); mbedtls_platform_set_time( dummy_constant_time );
#else #else
fprintf(stderr, "Warning: reprpduce without constant time\n"); fprintf( stderr, "Warning: reproduce without constant time\n" );
#endif #endif
} else { }
else
{
mbedtls_ssl_conf_rng( &conf, mbedtls_ctr_drbg_random, &ctr_drbg ); mbedtls_ssl_conf_rng( &conf, mbedtls_ctr_drbg_random, &ctr_drbg );
} }
mbedtls_ssl_conf_dbg( &conf, my_debug, stdout ); mbedtls_ssl_conf_dbg( &conf, my_debug, stdout );

40
programs/ssl/ssl_server2.c
View File

@ -666,8 +666,8 @@ int dummy_random( void *p_rng, unsigned char *output, size_t output_len )
size_t i; size_t i;
//use mbedtls_ctr_drbg_random to find bugs in it //use mbedtls_ctr_drbg_random to find bugs in it
ret = mbedtls_ctr_drbg_random(p_rng, output, output_len); ret = mbedtls_ctr_drbg_random( p_rng, output, output_len );
for (i=0; i<output_len; i++) { for ( i = 0; i < output_len; i++ ) {
//replace result with pseudo random //replace result with pseudo random
output[i] = (unsigned char) rand(); output[i] = (unsigned char) rand();
} }
@ -679,10 +679,8 @@ int dummy_entropy( void *data, unsigned char *output, size_t len )
size_t i; size_t i;
(void) data; (void) data;
//use mbedtls_entropy_func to find bugs in it //ret = mbedtls_entropy_func( data, output, len );
//test performance impact of entropy for (i = 0; i < len; i++ ) {
//ret = mbedtls_entropy_func(data, output, len);
for (i=0; i<len; i++) {
//replace result with pseudo random //replace result with pseudo random
output[i] = (unsigned char) rand(); output[i] = (unsigned char) rand();
} }
@ -2488,22 +2486,25 @@ int main( int argc, char *argv[] )
fflush( stdout ); fflush( stdout );
mbedtls_entropy_init( &entropy ); mbedtls_entropy_init( &entropy );
if (opt.reproducible) { if (opt.reproducible)
{
if( ( ret = mbedtls_ctr_drbg_seed( &ctr_drbg, dummy_entropy, if( ( ret = mbedtls_ctr_drbg_seed( &ctr_drbg, dummy_entropy,
&entropy, (const unsigned char *) pers, &entropy, (const unsigned char *) pers,
strlen( pers ) ) ) != 0 ) strlen( pers ) ) ) != 0 )
{ {
mbedtls_printf( " failed\n ! mbedtls_ctr_drbg_seed returned -0x%x\n", mbedtls_printf( " failed\n ! mbedtls_ctr_drbg_seed returned -0x%x\n",
-ret ); -ret );
goto exit; goto exit;
} }
} else { }
else
{
if( ( ret = mbedtls_ctr_drbg_seed( &ctr_drbg, mbedtls_entropy_func, if( ( ret = mbedtls_ctr_drbg_seed( &ctr_drbg, mbedtls_entropy_func,
&entropy, (const unsigned char *) pers, &entropy, (const unsigned char *) pers,
strlen( pers ) ) ) != 0 ) strlen( pers ) ) ) != 0 )
{ {
mbedtls_printf( " failed\n ! mbedtls_ctr_drbg_seed returned -0x%x\n", mbedtls_printf( " failed\n ! mbedtls_ctr_drbg_seed returned -0x%x\n",
-ret ); -ret );
goto exit; goto exit;
} }
} }
@ -2824,15 +2825,18 @@ int main( int argc, char *argv[] )
} }
#endif #endif
if (opt.reproducible) { if (opt.reproducible)
srand(1); {
srand( 1 );
mbedtls_ssl_conf_rng( &conf, dummy_random, &ctr_drbg ); mbedtls_ssl_conf_rng( &conf, dummy_random, &ctr_drbg );
#if defined(MBEDTLS_PLATFORM_TIME_ALT) #if defined(MBEDTLS_PLATFORM_TIME_ALT)
mbedtls_platform_set_time( dummy_constant_time ); mbedtls_platform_set_time( dummy_constant_time );
#else #else
fprintf(stderr, "Warning: reprpduce without constant time\n"); fprintf( stderr, "Warning: reproduce without constant time\n" );
#endif #endif
} else { }
else
{
mbedtls_ssl_conf_rng( &conf, mbedtls_ctr_drbg_random, &ctr_drbg ); mbedtls_ssl_conf_rng( &conf, mbedtls_ctr_drbg_random, &ctr_drbg );
} }
mbedtls_ssl_conf_dbg( &conf, my_debug, stdout ); mbedtls_ssl_conf_dbg( &conf, my_debug, stdout );