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

Define timing_selftest() even with TIMING_ALT

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-05-12 19:30:45 +02:00
parent a27b1979dc
commit 8903fe0fd3
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/mbedtls/timing.h
View File

@ -79,6 +79,18 @@ void mbedtls_set_alarm( int seconds );
*/ */
void mbedtls_timing_m_sleep( int milliseconds ); void mbedtls_timing_m_sleep( int milliseconds );
#ifdef __cplusplus
}
#endif
#else /* MBEDTLS_TIMING_ALT */
#include "timing_alt.h"
#endif /* MBEDTLS_TIMING_ALT */
#ifdef __cplusplus
extern "C" {
#endif
#if defined(MBEDTLS_SELF_TEST) #if defined(MBEDTLS_SELF_TEST)
/** /**
* \brief Checkup routine * \brief Checkup routine
@ -92,8 +104,4 @@ int mbedtls_timing_self_test( int verbose );
} }
#endif #endif
#else /* MBEDTLS_TIMING_ALT */
#include "timing_alt.h"
#endif /* MBEDTLS_TIMING_ALT */
#endif /* timing.h */ #endif /* timing.h */

8
library/timing.c
View File

@ -33,10 +33,12 @@
#define mbedtls_printf printf #define mbedtls_printf printf
#endif #endif
#if defined(MBEDTLS_TIMING_C) && !defined(MBEDTLS_TIMING_ALT) #if defined(MBEDTLS_TIMING_C)
#include "mbedtls/timing.h" #include "mbedtls/timing.h"
#if !defined(MBEDTLS_TIMING_ALT)
#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
#include <windows.h> #include <windows.h>
@ -333,6 +335,8 @@ void mbedtls_timing_m_sleep( int milliseconds )
#endif /* _WIN32 && !EFIX64 && !EFI32 */ #endif /* _WIN32 && !EFIX64 && !EFI32 */
#endif /* !MBEDTLS_TIMING_ALT */
#if defined(MBEDTLS_SELF_TEST) #if defined(MBEDTLS_SELF_TEST)
/* To test mbedtls_net_usleep against our functions */ /* To test mbedtls_net_usleep against our functions */
@ -501,4 +505,4 @@ hard_test:
#endif /* MBEDTLS_SELF_TEST */ #endif /* MBEDTLS_SELF_TEST */
#endif /* MBEDTLS_TIMING_C && !MBEDTLS_TIMING_ALT */ #endif /* MBEDTLS_TIMING_C */