From 2ebb1e18e997e7ba4e679d7b7b2fe1da4581d1f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Thu, 18 Jun 2020 11:59:57 +0200 Subject: [PATCH] Revert "Allow inclusion of entropy.h when it's disabled" This reverts commit 424210a93c05450a7a8a5b0f6255d788b3f93f74. This change was not safe enough for an LTS branch, as it might break code that assumes it's safe to declare an object of type mbedtls_entropy_context even when MBEDTLS_ENTROPY_C is undefined. --- include/mbedtls/entropy.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/mbedtls/entropy.h b/include/mbedtls/entropy.h index 8bf5d713e..ca06dc3c5 100644 --- a/include/mbedtls/entropy.h +++ b/include/mbedtls/entropy.h @@ -86,8 +86,6 @@ #define MBEDTLS_ENTROPY_SOURCE_STRONG 1 /**< Entropy source is strong */ #define MBEDTLS_ENTROPY_SOURCE_WEAK 0 /**< Entropy source is weak */ -#if defined(MBEDTLS_ENTROPY_C) - #ifdef __cplusplus extern "C" { #endif @@ -288,6 +286,4 @@ int mbedtls_entropy_source_self_test( int verbose ); } #endif -#endif /* MBEDTLS_ENTROPY_C */ - #endif /* entropy.h */