diff --git a/deps/mbedtls/mbedtls/compat-1.3.h b/deps/mbedtls/mbedtls/compat-1.3.h index d8a96ef826..bda4883d77 100644 --- a/deps/mbedtls/mbedtls/compat-1.3.h +++ b/deps/mbedtls/mbedtls/compat-1.3.h @@ -495,9 +495,6 @@ #if defined MBEDTLS_THREADING_PTHREAD #define POLARSSL_THREADING_PTHREAD MBEDTLS_THREADING_PTHREAD #endif -#if defined MBEDTLS_TIMING_ALT -#define POLARSSL_TIMING_ALT MBEDTLS_TIMING_ALT -#endif #if defined MBEDTLS_TIMING_C #define POLARSSL_TIMING_C MBEDTLS_TIMING_C #endif diff --git a/deps/mbedtls/mbedtls/config.h b/deps/mbedtls/mbedtls/config.h index f7681c9580..fa1a83897f 100644 --- a/deps/mbedtls/mbedtls/config.h +++ b/deps/mbedtls/mbedtls/config.h @@ -119,21 +119,6 @@ * \{ */ -/** - * \def MBEDTLS_TIMING_ALT - * - * Uncomment to provide your own alternate implementation for mbedtls_timing_hardclock(), - * mbedtls_timing_get_timer(), mbedtls_set_alarm(), mbedtls_set/get_delay() - * - * Only works if you have MBEDTLS_TIMING_C enabled. - * - * You will need to provide a header "timing_alt.h" and an implementation at - * compile time. - */ -#if 0 -#define MBEDTLS_TIMING_ALT -#endif - /** * \def MBEDTLS_AES_ALT * @@ -2212,11 +2197,6 @@ #define MBEDTLS_ENTROPY_MIN_HARDWARE 32 /**< Default minimum number of bytes required for the hardware entropy source mbedtls_hardware_poll() before entropy is released */ #endif -/* Memory buffer allocator options */ -#if 0 -#define MBEDTLS_MEMORY_ALIGN_MULTIPLE 4 /**< Align on multiples of this value */ -#endif - /* Platform options */ #if 0 #define MBEDTLS_PLATFORM_STD_TIME time /**< Default time to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */ diff --git a/deps/mbedtls/mbedtls/timing.h b/deps/mbedtls/mbedtls/timing.h index 780de08805..522c848e8e 100644 --- a/deps/mbedtls/mbedtls/timing.h +++ b/deps/mbedtls/mbedtls/timing.h @@ -29,7 +29,6 @@ #include MBEDTLS_CONFIG_FILE #endif -#if !defined(MBEDTLS_TIMING_ALT) /* Regular implementation */ #include @@ -116,10 +115,6 @@ int mbedtls_timing_get_delay( void *data ); } #endif -#else /* MBEDTLS_TIMING_ALT */ -#include "timing_alt.h" -#endif /* MBEDTLS_TIMING_ALT */ - #ifdef __cplusplus extern "C" { #endif diff --git a/deps/mbedtls/timing.c b/deps/mbedtls/timing.c index 9737fe5688..2ca0f75ecc 100644 --- a/deps/mbedtls/timing.c +++ b/deps/mbedtls/timing.c @@ -29,8 +29,6 @@ #include "mbedtls/timing.h" -#if !defined(MBEDTLS_TIMING_ALT) - #if !defined(unix) && !defined(__unix__) && !defined(__unix) && \ !defined(__APPLE__) && !defined(_WIN32) && !defined(__HAIKU__) #error "This module only works on Unix and Windows, see MBEDTLS_TIMING_C in config.h" @@ -348,6 +346,4 @@ int mbedtls_timing_get_delay( void *data ) return( 0 ); } -#endif /* !MBEDTLS_TIMING_ALT */ - #endif /* MBEDTLS_TIMING_C */