From cde2aba0af48a70519db5cf9a6192b2490275320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Thu, 25 Jun 2015 08:55:13 +0200 Subject: [PATCH] Do no test net_usleep in timing_selftest Timing belongs in libcrypto (due to havege depending on it) while net.c was put in libtls (only test ssl servers use it) --- library/timing.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/library/timing.c b/library/timing.c index bdbdccef1..96e3b6a08 100644 --- a/library/timing.c +++ b/library/timing.c @@ -355,11 +355,6 @@ int mbedtls_timing_get_delay( void *data ) #if defined(MBEDTLS_SELF_TEST) -/* To test mbedtls_net_usleep against our functions */ -#if defined(MBEDTLS_NET_C) -#include "mbedtls/net.h" -#endif - /* * Busy-waits for the given number of milliseconds. * Used for testing mbedtls_timing_hardclock. @@ -511,31 +506,6 @@ hard_test: if( verbose != 0 ) mbedtls_printf( "passed\n" ); -#if defined(MBEDTLS_NET_C) - if( verbose != 0 ) - mbedtls_printf( " TIMING test #4 (net_usleep/ get_timer): " ); - - for( secs = 1; secs <= 3; secs++ ) - { - (void) mbedtls_timing_get_timer( &hires, 1 ); - - mbedtls_net_usleep( 500000 * secs ); - - millisecs = mbedtls_timing_get_timer( &hires, 0 ); - - if( millisecs < 450 * secs || millisecs > 550 * secs ) - { - if( verbose != 0 ) - mbedtls_printf( "failed\n" ); - - return( 1 ); - } - } - - if( verbose != 0 ) - mbedtls_printf( "passed\n" ); -#endif /* MBEDTLS_NET_C */ - if( verbose != 0 ) mbedtls_printf( "\n" );