Merge pull request #5708 from AndrzejKurek/timeless-struggles

Remove the dependency on MBEDTLS_TIME_H from the timing module
This commit is contained in:
Gilles Peskine 2022-04-08 18:43:16 +02:00 committed by GitHub
commit e1730e492d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 37 deletions

View file

@ -129,7 +129,12 @@
* MBEDTLS_PLATFORM_TIME_MACRO, MBEDTLS_PLATFORM_TIME_TYPE_MACRO and * MBEDTLS_PLATFORM_TIME_MACRO, MBEDTLS_PLATFORM_TIME_TYPE_MACRO and
* MBEDTLS_PLATFORM_STD_TIME. * MBEDTLS_PLATFORM_STD_TIME.
* *
* Comment if your system does not support time functions * Comment if your system does not support time functions.
*
* \note If MBEDTLS_TIMING_C is set - to enable the semi-portable timing
* interface - timing.c will include time.h on suitable platforms
* regardless of the setting of MBEDTLS_HAVE_TIME, unless
* MBEDTLS_TIMING_ALT is used. See timing.c for more information.
*/ */
#define MBEDTLS_HAVE_TIME #define MBEDTLS_HAVE_TIME
@ -3013,6 +3018,10 @@
* your own implementation of the whole module by setting * your own implementation of the whole module by setting
* \c MBEDTLS_TIMING_ALT in the current file. * \c MBEDTLS_TIMING_ALT in the current file.
* *
* \note The timing module will include time.h on suitable platforms
* regardless of the setting of MBEDTLS_HAVE_TIME, unless
* MBEDTLS_TIMING_ALT is used. See timing.c for more information.
*
* \note See also our Knowledge Base article about porting to a new * \note See also our Knowledge Base article about porting to a new
* environment: * environment:
* https://tls.mbed.org/kb/how-to/how-do-i-port-mbed-tls-to-a-new-environment-OS * https://tls.mbed.org/kb/how-to/how-do-i-port-mbed-tls-to-a-new-environment-OS

View file

@ -46,14 +46,14 @@ struct _hr_time
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <signal.h> #include <signal.h>
#if defined(MBEDTLS_HAVE_TIME) /* time.h should be included independently of MBEDTLS_HAVE_TIME. If the
* platform matches the ifdefs above, it will be used. */
#include <time.h> #include <time.h>
#include <sys/time.h> #include <sys/time.h>
struct _hr_time struct _hr_time
{ {
struct timeval start; struct timeval start;
}; };
#endif
#endif /* _WIN32 && !EFIX64 && !EFI32 */ #endif /* _WIN32 && !EFIX64 && !EFI32 */
/** /**
@ -75,7 +75,6 @@ struct _hr_time
* get_timer(0) }` the value time1+time2 is only approximately * get_timer(0) }` the value time1+time2 is only approximately
* the delay since the first reset. * the delay since the first reset.
*/ */
#if defined(MBEDTLS_HAVE_TIME)
#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) #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 )
@ -167,33 +166,5 @@ uint32_t mbedtls_timing_get_final_delay(
{ {
return( data->fin_ms ); return( data->fin_ms );
} }
#else /* MBEDTLS_HAVE_TIME */
uint32_t mbedtls_timing_get_final_delay(
const mbedtls_timing_delay_context *data )
{
(void) data;
return( 0 );
}
int mbedtls_timing_get_delay( void *data )
{
(void) data;
return( 0 );
}
void mbedtls_timing_set_delay( void *data, uint32_t int_ms, uint32_t fin_ms )
{
(void) data;
(void) int_ms;
(void) fin_ms;
}
unsigned long mbedtls_timing_get_timer( struct mbedtls_timing_hr_time *val, int reset )
{
(void) val;
(void) reset;
return( 0 );
}
#endif /* MBEDTLS_HAVE_TIME */
#endif /* !MBEDTLS_TIMING_ALT */ #endif /* !MBEDTLS_TIMING_ALT */
#endif /* MBEDTLS_TIMING_C */ #endif /* MBEDTLS_TIMING_C */

View file

@ -825,7 +825,6 @@ int main( int argc, char *argv[] )
get_options( argc, argv ); get_options( argc, argv );
#if defined(MBEDTLS_HAVE_TIME)
/* /*
* Decisions to drop/delay/duplicate packets are pseudo-random: dropping * Decisions to drop/delay/duplicate packets are pseudo-random: dropping
* exactly 1 in N packets would lead to problems when a flight has exactly * exactly 1 in N packets would lead to problems when a flight has exactly
@ -836,12 +835,15 @@ int main( int argc, char *argv[] )
*/ */
if( opt.seed == 0 ) if( opt.seed == 0 )
{ {
#if defined(MBEDTLS_HAVE_TIME)
opt.seed = (unsigned int) mbedtls_time( NULL ); opt.seed = (unsigned int) mbedtls_time( NULL );
#else
opt.seed = 1;
#endif /* MBEDTLS_HAVE_TIME */
mbedtls_printf( " . Pseudo-random seed: %u\n", opt.seed ); mbedtls_printf( " . Pseudo-random seed: %u\n", opt.seed );
} }
srand( opt.seed ); srand( opt.seed );
#endif /* MBEDTLS_HAVE_TIME */
/* /*
* 0. "Connect" to the server * 0. "Connect" to the server

View file

@ -1,11 +1,8 @@
Timing: get timer Timing: get timer
depends_on:MBEDTLS_HAVE_TIME
timing_get_timer: timing_get_timer:
Timing: delay 0ms Timing: delay 0ms
depends_on:MBEDTLS_HAVE_TIME
timing_delay:0: timing_delay:0:
Timing: delay 100ms Timing: delay 100ms
depends_on:MBEDTLS_HAVE_TIME
timing_delay:100: timing_delay:100: