make style

This commit is contained in:
Philippe Teuwen 2019-03-10 00:00:59 +01:00
commit 0373696662
483 changed files with 56514 additions and 52451 deletions

View file

@ -55,8 +55,7 @@
#include <windows.h>
#include <winbase.h>
struct _hr_time
{
struct _hr_time {
LARGE_INTEGER start;
};
@ -68,8 +67,7 @@ struct _hr_time
#include <signal.h>
#include <time.h>
struct _hr_time
{
struct _hr_time {
struct timeval start;
};
@ -80,12 +78,12 @@ struct _hr_time
#define HAVE_HARDCLOCK
unsigned long mbedtls_timing_hardclock( void )
unsigned long mbedtls_timing_hardclock(void)
{
unsigned long tsc;
__asm rdtsc
__asm mov [tsc], eax
return( tsc );
return (tsc);
}
#endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
( _MSC_VER && _M_IX86 ) || __WATCOMC__ */
@ -97,11 +95,11 @@ unsigned long mbedtls_timing_hardclock( void )
#define HAVE_HARDCLOCK
unsigned long mbedtls_timing_hardclock( void )
unsigned long mbedtls_timing_hardclock(void)
{
unsigned long lo, hi;
asm volatile( "rdtsc" : "=a" (lo), "=d" (hi) );
return( lo );
asm volatile("rdtsc" : "=a"(lo), "=d"(hi));
return (lo);
}
#endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
__GNUC__ && __i386__ */
@ -111,11 +109,11 @@ unsigned long mbedtls_timing_hardclock( void )
#define HAVE_HARDCLOCK
unsigned long mbedtls_timing_hardclock( void )
unsigned long mbedtls_timing_hardclock(void)
{
unsigned long lo, hi;
asm volatile( "rdtsc" : "=a" (lo), "=d" (hi) );
return( lo | ( hi << 32 ) );
asm volatile("rdtsc" : "=a"(lo), "=d"(hi));
return (lo | (hi << 32));
}
#endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
__GNUC__ && ( __amd64__ || __x86_64__ ) */
@ -125,19 +123,17 @@ unsigned long mbedtls_timing_hardclock( void )
#define HAVE_HARDCLOCK
unsigned long mbedtls_timing_hardclock( void )
unsigned long mbedtls_timing_hardclock(void)
{
unsigned long tbl, tbu0, tbu1;
do
{
asm volatile( "mftbu %0" : "=r" (tbu0) );
asm volatile( "mftb %0" : "=r" (tbl ) );
asm volatile( "mftbu %0" : "=r" (tbu1) );
}
while( tbu0 != tbu1 );
do {
asm volatile("mftbu %0" : "=r"(tbu0));
asm volatile("mftb %0" : "=r"(tbl));
asm volatile("mftbu %0" : "=r"(tbu1));
} while (tbu0 != tbu1);
return( tbl );
return (tbl);
}
#endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
__GNUC__ && ( __powerpc__ || __ppc__ ) */
@ -150,11 +146,11 @@ unsigned long mbedtls_timing_hardclock( void )
#else
#define HAVE_HARDCLOCK
unsigned long mbedtls_timing_hardclock( void )
unsigned long mbedtls_timing_hardclock(void)
{
unsigned long tick;
asm volatile( "rdpr %%tick, %0;" : "=&r" (tick) );
return( tick );
asm volatile("rdpr %%tick, %0;" : "=&r"(tick));
return (tick);
}
#endif /* __OpenBSD__ */
#endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
@ -165,12 +161,12 @@ unsigned long mbedtls_timing_hardclock( void )
#define HAVE_HARDCLOCK
unsigned long mbedtls_timing_hardclock( void )
unsigned long mbedtls_timing_hardclock(void)
{
unsigned long tick;
asm volatile( ".byte 0x83, 0x41, 0x00, 0x00" );
asm volatile( "mov %%g1, %0" : "=r" (tick) );
return( tick );
asm volatile(".byte 0x83, 0x41, 0x00, 0x00");
asm volatile("mov %%g1, %0" : "=r"(tick));
return (tick);
}
#endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
__GNUC__ && __sparc__ && !__sparc64__ */
@ -180,11 +176,11 @@ unsigned long mbedtls_timing_hardclock( void )
#define HAVE_HARDCLOCK
unsigned long mbedtls_timing_hardclock( void )
unsigned long mbedtls_timing_hardclock(void)
{
unsigned long cc;
asm volatile( "rpcc %0" : "=r" (cc) );
return( cc & 0xFFFFFFFF );
asm volatile("rpcc %0" : "=r"(cc));
return (cc & 0xFFFFFFFF);
}
#endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
__GNUC__ && __alpha__ */
@ -194,11 +190,11 @@ unsigned long mbedtls_timing_hardclock( void )
#define HAVE_HARDCLOCK
unsigned long mbedtls_timing_hardclock( void )
unsigned long mbedtls_timing_hardclock(void)
{
unsigned long itc;
asm volatile( "mov %0 = ar.itc" : "=r" (itc) );
return( itc );
asm volatile("mov %0 = ar.itc" : "=r"(itc));
return (itc);
}
#endif /* !HAVE_HARDCLOCK && MBEDTLS_HAVE_ASM &&
__GNUC__ && __ia64__ */
@ -208,13 +204,13 @@ unsigned long mbedtls_timing_hardclock( void )
#define HAVE_HARDCLOCK
unsigned long mbedtls_timing_hardclock( void )
unsigned long mbedtls_timing_hardclock(void)
{
LARGE_INTEGER offset;
QueryPerformanceCounter( &offset );
QueryPerformanceCounter(&offset);
return( (unsigned long)( offset.QuadPart ) );
return ((unsigned long)(offset.QuadPart));
}
#endif /* !HAVE_HARDCLOCK && _MSC_VER && !EFIX64 && !EFI32 */
@ -225,27 +221,26 @@ unsigned long mbedtls_timing_hardclock( void )
static int hardclock_init = 0;
static struct timeval tv_init;
unsigned long mbedtls_timing_hardclock( void )
unsigned long mbedtls_timing_hardclock(void)
{
struct timeval tv_cur;
if( hardclock_init == 0 )
{
if (hardclock_init == 0) {
#ifdef __MINGW32__
mingw_gettimeofday( &tv_init, NULL );
mingw_gettimeofday(&tv_init, NULL);
#else
gettimeofday( &tv_init, NULL );
gettimeofday(&tv_init, NULL);
#endif
hardclock_init = 1;
}
#ifdef __MINGW32__
mingw_gettimeofday( &tv_cur, NULL );
mingw_gettimeofday(&tv_cur, NULL);
#else
gettimeofday( &tv_cur, NULL );
gettimeofday(&tv_cur, NULL);
#endif
return( ( tv_cur.tv_sec - tv_init.tv_sec ) * 1000000
+ ( tv_cur.tv_usec - tv_init.tv_usec ) );
return ((tv_cur.tv_sec - tv_init.tv_sec) * 1000000
+ (tv_cur.tv_usec - tv_init.tv_usec));
}
#endif /* !HAVE_HARDCLOCK */
@ -253,44 +248,40 @@ volatile int mbedtls_timing_alarmed = 0;
#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
unsigned long mbedtls_timing_get_timer( struct mbedtls_timing_hr_time *val, int reset )
unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset)
{
struct _hr_time *t = (struct _hr_time *) val;
if( reset )
{
QueryPerformanceCounter( &t->start );
return( 0 );
}
else
{
if (reset) {
QueryPerformanceCounter(&t->start);
return (0);
} else {
unsigned long delta;
LARGE_INTEGER now, hfreq;
QueryPerformanceCounter( &now );
QueryPerformanceFrequency( &hfreq );
delta = (unsigned long)( ( now.QuadPart - t->start.QuadPart ) * 1000ul
/ hfreq.QuadPart );
return( delta );
QueryPerformanceCounter(&now);
QueryPerformanceFrequency(&hfreq);
delta = (unsigned long)((now.QuadPart - t->start.QuadPart) * 1000ul
/ hfreq.QuadPart);
return (delta);
}
}
/* It's OK to use a global because alarm() is supposed to be global anyway */
static DWORD alarmMs;
static DWORD WINAPI TimerProc( LPVOID TimerContext )
static DWORD WINAPI TimerProc(LPVOID TimerContext)
{
((void) TimerContext);
Sleep( alarmMs );
Sleep(alarmMs);
mbedtls_timing_alarmed = 1;
return( TRUE );
return (TRUE);
}
void mbedtls_set_alarm( int seconds )
void mbedtls_set_alarm(int seconds)
{
DWORD ThreadId;
if( seconds == 0 )
{
if (seconds == 0) {
/* No need to create a thread for this simple case.
* Also, this shorcut is more reliable at least on MinGW32 */
mbedtls_timing_alarmed = 1;
@ -299,44 +290,40 @@ void mbedtls_set_alarm( int seconds )
mbedtls_timing_alarmed = 0;
alarmMs = seconds * 1000;
CloseHandle( CreateThread( NULL, 0, TimerProc, NULL, 0, &ThreadId ) );
CloseHandle(CreateThread(NULL, 0, TimerProc, NULL, 0, &ThreadId));
}
#else /* _WIN32 && !EFIX64 && !EFI32 */
unsigned long mbedtls_timing_get_timer( struct mbedtls_timing_hr_time *val, int reset )
unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset)
{
struct _hr_time *t = (struct _hr_time *) val;
if( reset )
{
gettimeofday( &t->start, NULL );
return( 0 );
}
else
{
if (reset) {
gettimeofday(&t->start, NULL);
return (0);
} else {
unsigned long delta;
struct timeval now;
gettimeofday( &now, NULL );
delta = ( now.tv_sec - t->start.tv_sec ) * 1000ul
+ ( now.tv_usec - t->start.tv_usec ) / 1000;
return( delta );
gettimeofday(&now, NULL);
delta = (now.tv_sec - t->start.tv_sec) * 1000ul
+ (now.tv_usec - t->start.tv_usec) / 1000;
return (delta);
}
}
static void sighandler( int signum )
static void sighandler(int signum)
{
mbedtls_timing_alarmed = 1;
signal( signum, sighandler );
signal(signum, sighandler);
}
void mbedtls_set_alarm( int seconds )
void mbedtls_set_alarm(int seconds)
{
mbedtls_timing_alarmed = 0;
signal( SIGALRM, sighandler );
alarm( seconds );
if( seconds == 0 )
{
signal(SIGALRM, sighandler);
alarm(seconds);
if (seconds == 0) {
/* alarm(0) cancelled any previous pending alarm, but the
handler won't fire, so raise the flag straight away. */
mbedtls_timing_alarmed = 1;
@ -348,37 +335,37 @@ void mbedtls_set_alarm( int seconds )
/*
* Set delays to watch
*/
void mbedtls_timing_set_delay( void *data, uint32_t int_ms, uint32_t fin_ms )
void mbedtls_timing_set_delay(void *data, uint32_t int_ms, uint32_t fin_ms)
{
mbedtls_timing_delay_context *ctx = (mbedtls_timing_delay_context *) data;
ctx->int_ms = int_ms;
ctx->fin_ms = fin_ms;
if( fin_ms != 0 )
(void) mbedtls_timing_get_timer( &ctx->timer, 1 );
if (fin_ms != 0)
(void) mbedtls_timing_get_timer(&ctx->timer, 1);
}
/*
* Get number of delays expired
*/
int mbedtls_timing_get_delay( void *data )
int mbedtls_timing_get_delay(void *data)
{
mbedtls_timing_delay_context *ctx = (mbedtls_timing_delay_context *) data;
unsigned long elapsed_ms;
if( ctx->fin_ms == 0 )
return( -1 );
if (ctx->fin_ms == 0)
return (-1);
elapsed_ms = mbedtls_timing_get_timer( &ctx->timer, 0 );
elapsed_ms = mbedtls_timing_get_timer(&ctx->timer, 0);
if( elapsed_ms >= ctx->fin_ms )
return( 2 );
if (elapsed_ms >= ctx->fin_ms)
return (2);
if( elapsed_ms >= ctx->int_ms )
return( 1 );
if (elapsed_ms >= ctx->int_ms)
return (1);
return( 0 );
return (0);
}
#endif /* !MBEDTLS_TIMING_ALT */
@ -389,15 +376,15 @@ int mbedtls_timing_get_delay( void *data )
* Busy-waits for the given number of milliseconds.
* Used for testing mbedtls_timing_hardclock.
*/
static void busy_msleep( unsigned long msec )
static void busy_msleep(unsigned long msec)
{
struct mbedtls_timing_hr_time hires;
unsigned long i = 0; /* for busy-waiting */
volatile unsigned long j; /* to prevent optimisation */
(void) mbedtls_timing_get_timer( &hires, 1 );
(void) mbedtls_timing_get_timer(&hires, 1);
while( mbedtls_timing_get_timer( &hires, 0 ) < msec )
while (mbedtls_timing_get_timer(&hires, 0) < msec)
i++;
j = i;
@ -426,7 +413,7 @@ static void busy_msleep( unsigned long msec )
* Warning: this is work in progress, some tests may not be reliable enough
* yet! False positives may happen.
*/
int mbedtls_timing_self_test( int verbose )
int mbedtls_timing_self_test(int verbose)
{
unsigned long cycles = 0, ratio = 0;
unsigned long millisecs = 0, secs = 0;
@ -435,63 +422,63 @@ int mbedtls_timing_self_test( int verbose )
uint32_t a = 0, b = 0;
mbedtls_timing_delay_context ctx;
if( verbose != 0 )
mbedtls_printf( " TIMING tests note: will take some time!\n" );
if (verbose != 0)
mbedtls_printf(" TIMING tests note: will take some time!\n");
if( verbose != 0 )
mbedtls_printf( " TIMING test #1 (set_alarm / get_timer): " );
if (verbose != 0)
mbedtls_printf(" TIMING test #1 (set_alarm / get_timer): ");
{
secs = 1;
(void) mbedtls_timing_get_timer( &hires, 1 );
(void) mbedtls_timing_get_timer(&hires, 1);
mbedtls_set_alarm( (int) secs );
while( !mbedtls_timing_alarmed )
mbedtls_set_alarm((int) secs);
while (!mbedtls_timing_alarmed)
;
millisecs = mbedtls_timing_get_timer( &hires, 0 );
millisecs = mbedtls_timing_get_timer(&hires, 0);
/* For some reason on Windows it looks like alarm has an extra delay
* (maybe related to creating a new thread). Allow some room here. */
if( millisecs < 800 * secs || millisecs > 1200 * secs + 300 )
if (millisecs < 800 * secs || millisecs > 1200 * secs + 300)
FAIL;
}
if( verbose != 0 )
mbedtls_printf( "passed\n" );
if (verbose != 0)
mbedtls_printf("passed\n");
if( verbose != 0 )
mbedtls_printf( " TIMING test #2 (set/get_delay ): " );
if (verbose != 0)
mbedtls_printf(" TIMING test #2 (set/get_delay ): ");
{
a = 800;
b = 400;
mbedtls_timing_set_delay( &ctx, a, a + b ); /* T = 0 */
mbedtls_timing_set_delay(&ctx, a, a + b); /* T = 0 */
busy_msleep( a - a / 4 ); /* T = a - a/4 */
if( mbedtls_timing_get_delay( &ctx ) != 0 )
busy_msleep(a - a / 4); /* T = a - a/4 */
if (mbedtls_timing_get_delay(&ctx) != 0)
FAIL;
busy_msleep( a / 4 + b / 4 ); /* T = a + b/4 */
if( mbedtls_timing_get_delay( &ctx ) != 1 )
busy_msleep(a / 4 + b / 4); /* T = a + b/4 */
if (mbedtls_timing_get_delay(&ctx) != 1)
FAIL;
busy_msleep( b ); /* T = a + b + b/4 */
if( mbedtls_timing_get_delay( &ctx ) != 2 )
busy_msleep(b); /* T = a + b + b/4 */
if (mbedtls_timing_get_delay(&ctx) != 2)
FAIL;
}
mbedtls_timing_set_delay( &ctx, 0, 0 );
busy_msleep( 200 );
if( mbedtls_timing_get_delay( &ctx ) != -1 )
mbedtls_timing_set_delay(&ctx, 0, 0);
busy_msleep(200);
if (mbedtls_timing_get_delay(&ctx) != -1)
FAIL;
if( verbose != 0 )
mbedtls_printf( "passed\n" );
if (verbose != 0)
mbedtls_printf("passed\n");
if( verbose != 0 )
mbedtls_printf( " TIMING test #3 (hardclock / get_timer): " );
if (verbose != 0)
mbedtls_printf(" TIMING test #3 (hardclock / get_timer): ");
/*
* Allow one failure for possible counter wrapping.
@ -500,10 +487,9 @@ int mbedtls_timing_self_test( int verbose )
*/
hard_test:
if( hardfail > 1 )
{
if( verbose != 0 )
mbedtls_printf( "failed (ignored)\n" );
if (hardfail > 1) {
if (verbose != 0)
mbedtls_printf("failed (ignored)\n");
goto hard_test_done;
}
@ -511,35 +497,33 @@ hard_test:
/* Get a reference ratio cycles/ms */
millisecs = 1;
cycles = mbedtls_timing_hardclock();
busy_msleep( millisecs );
busy_msleep(millisecs);
cycles = mbedtls_timing_hardclock() - cycles;
ratio = cycles / millisecs;
/* Check that the ratio is mostly constant */
for( millisecs = 2; millisecs <= 4; millisecs++ )
{
for (millisecs = 2; millisecs <= 4; millisecs++) {
cycles = mbedtls_timing_hardclock();
busy_msleep( millisecs );
busy_msleep(millisecs);
cycles = mbedtls_timing_hardclock() - cycles;
/* Allow variation up to 20% */
if( cycles / millisecs < ratio - ratio / 5 ||
cycles / millisecs > ratio + ratio / 5 )
{
if (cycles / millisecs < ratio - ratio / 5 ||
cycles / millisecs > ratio + ratio / 5) {
hardfail++;
goto hard_test;
}
}
if( verbose != 0 )
mbedtls_printf( "passed\n" );
if (verbose != 0)
mbedtls_printf("passed\n");
hard_test_done:
if( verbose != 0 )
mbedtls_printf( "\n" );
if (verbose != 0)
mbedtls_printf("\n");
return( 0 );
return (0);
}
#endif /* MBEDTLS_SELF_TEST */