From 5a8d56d3a3848659734eb6ae698dde643cbd5e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Wed, 13 May 2015 10:10:00 +0200 Subject: [PATCH] Rm hard dependency of DTLS on TIMING_C --- include/mbedtls/check_config.h | 7 +++---- include/mbedtls/config.h | 5 ----- tests/scripts/all.sh | 10 ---------- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h index e1b330f43..4a0e287d2 100644 --- a/include/mbedtls/check_config.h +++ b/include/mbedtls/check_config.h @@ -351,10 +351,9 @@ #error "MBEDTLS_SSL_PROTO_TLS1_2 defined, but not all prerequisites" #endif -#if defined(MBEDTLS_SSL_PROTO_DTLS) && ( \ - ( !defined(MBEDTLS_SSL_PROTO_TLS1_1) && \ - !defined(MBEDTLS_SSL_PROTO_TLS1_2) ) || \ - !defined(MBEDTLS_TIMING_C) ) +#if defined(MBEDTLS_SSL_PROTO_DTLS) && \ + !defined(MBEDTLS_SSL_PROTO_TLS1_1) && \ + !defined(MBEDTLS_SSL_PROTO_TLS1_2) #error "MBEDTLS_SSL_PROTO_DTLS defined, but not all prerequisites" #endif diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h index fc86056b4..34d0bc2f6 100644 --- a/include/mbedtls/config.h +++ b/include/mbedtls/config.h @@ -1046,11 +1046,6 @@ * * Requires: MBEDTLS_SSL_PROTO_TLS1_1 * or MBEDTLS_SSL_PROTO_TLS1_2 - * MBEDTLS_TIMING_C - * - * \note Dependency on TIMING_C may be replaced by something more flexible - * (callbacks or abstraction layer in the next major version). Please contact - * us if you're having issues with this dependency. * * Comment this macro to disable support for DTLS */ diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index b29e07a13..ca116be7c 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -166,11 +166,6 @@ scripts/config.pl full scripts/config.pl unset MBEDTLS_NET_C scripts/config.pl unset MBEDTLS_TIMING_C scripts/config.pl unset MBEDTLS_FS_IO -scripts/config.pl unset MBEDTLS_SSL_PROTO_DTLS # timing.c -scripts/config.pl unset MBEDTLS_SSL_DTLS_ANTI_REPLAY -scripts/config.pl unset MBEDTLS_SSL_DTLS_HELLO_VERIFY -scripts/config.pl unset MBEDTLS_SSL_DTLS_BADMAC_LIMIT -scripts/config.pl unset MBEDTLS_SSL_COOKIE_C # following things are not in the default config scripts/config.pl unset MBEDTLS_HAVEGE_C # depends on timing.c scripts/config.pl unset MBEDTLS_THREADING_PTHREAD @@ -189,11 +184,6 @@ scripts/config.pl unset MBEDTLS_NET_C scripts/config.pl unset MBEDTLS_TIMING_C scripts/config.pl unset MBEDTLS_FS_IO scripts/config.pl unset MBEDTLS_HAVE_TIME -scripts/config.pl unset MBEDTLS_SSL_PROTO_DTLS # timing.c -scripts/config.pl unset MBEDTLS_SSL_DTLS_ANTI_REPLAY -scripts/config.pl unset MBEDTLS_SSL_DTLS_HELLO_VERIFY -scripts/config.pl unset MBEDTLS_SSL_DTLS_BADMAC_LIMIT -scripts/config.pl unset MBEDTLS_SSL_COOKIE_C # following things are not in the default config scripts/config.pl unset MBEDTLS_DEPRECATED_WARNING scripts/config.pl unset MBEDTLS_HAVEGE_C # depends on timing.c