Use platform layer in programs for consistency.

This commit is contained in:
Rich Evans 2015-01-19 14:26:37 +00:00 committed by Paul Bakker
parent e94e6e5b9c
commit f90016aade
48 changed files with 1572 additions and 1145 deletions

View file

@ -26,6 +26,15 @@
#include POLARSSL_CONFIG_FILE
#endif
#if defined(POLARSSL_PLATFORM_C)
#include "polarssl/platform.h"
#else
#define polarssl_printf printf
#define polarssl_fprintf fprintf
#define polarssl_malloc malloc
#define polarssl_free free
#endif
#include "polarssl/havege.h"
#include <time.h>
@ -37,7 +46,7 @@ int main( int argc, char *argv[] )
((void) argc);
((void) argv);
printf("POLARSSL_HAVEGE_C not defined.\n");
polarssl_printf("POLARSSL_HAVEGE_C not defined.\n");
return( 0 );
}
#else
@ -51,13 +60,13 @@ int main( int argc, char *argv[] )
if( argc < 2 )
{
fprintf( stderr, "usage: %s <output filename>\n", argv[0] );
polarssl_fprintf( stderr, "usage: %s <output filename>\n", argv[0] );
return( 1 );
}
if( ( f = fopen( argv[1], "wb+" ) ) == NULL )
{
printf( "failed to open '%s' for writing.\n", argv[0] );
polarssl_printf( "failed to open '%s' for writing.\n", argv[0] );
return( 1 );
}
@ -69,7 +78,7 @@ int main( int argc, char *argv[] )
{
if( havege_random( &hs, buf, sizeof( buf ) ) != 0 )
{
printf( "Failed to get random from source.\n" );
polarssl_printf( "Failed to get random from source.\n" );
ret = 1;
goto exit;
@ -77,7 +86,7 @@ int main( int argc, char *argv[] )
fwrite( buf, sizeof( buf ), 1, f );
printf( "Generating 32Mb of data in file '%s'... %04.1f" \
polarssl_printf( "Generating 32Mb of data in file '%s'... %04.1f" \
"%% done\r", argv[1], (100 * (float) (i + 1)) / k );
fflush( stdout );
}
@ -85,7 +94,7 @@ int main( int argc, char *argv[] )
if( t == time( NULL ) )
t--;
printf(" \n ");
polarssl_printf(" \n ");
exit:
havege_free( &hs );