From a7aa80c058048bed00ca8fdff4b696cb11dbaa07 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Thu, 15 Sep 2022 20:22:04 +0200 Subject: [PATCH] Include platform.h unconditionally: second automatic part Some source files included platform.h in a nested conditional. The previous commit "Include platform.h unconditionally: automatic part" only removed the outer conditional. This commit removes the inner conditional. This commit once again replaces most occurrences of conditional inclusion of platform.h, using the following code: ``` perl -i -0777 -pe 's!#if.*\n#include "mbedtls/platform.h"\n(#else.*\n(#define (mbedtls|MBEDTLS)_.*\n|#include <(stdarg|stddef|stdio|stdlib|string|time)\.h>\n)*)?#endif.*!#include "mbedtls/platform.h"!mg' $(git grep -l '#include "mbedtls/platform.h"') ``` Signed-off-by: Gilles Peskine --- library/aes.c | 2 -- library/aria.c | 2 -- library/camellia.c | 2 -- library/chacha20.c | 2 -- library/chachapoly.c | 2 -- library/ctr_drbg.c | 2 -- library/des.c | 2 -- library/entropy.c | 2 -- library/hmac_drbg.c | 2 -- library/md5.c | 2 -- library/nist_kw.c | 2 -- library/poly1305.c | 2 -- library/ripemd160.c | 2 -- library/sha1.c | 2 -- library/sha256.c | 2 -- library/sha512.c | 2 -- 16 files changed, 32 deletions(-) diff --git a/library/aes.c b/library/aes.c index 872930f2ac..a48658fc78 100644 --- a/library/aes.c +++ b/library/aes.c @@ -40,9 +40,7 @@ #include "aesni.h" #endif -#if defined(MBEDTLS_SELF_TEST) #include "mbedtls/platform.h" -#endif /* MBEDTLS_SELF_TEST */ #if !defined(MBEDTLS_AES_ALT) diff --git a/library/aria.c b/library/aria.c index cfa69c2ad6..f78d289a45 100644 --- a/library/aria.c +++ b/library/aria.c @@ -31,9 +31,7 @@ #include -#if defined(MBEDTLS_SELF_TEST) #include "mbedtls/platform.h" -#endif /* MBEDTLS_SELF_TEST */ #if !defined(MBEDTLS_ARIA_ALT) diff --git a/library/camellia.c b/library/camellia.c index 24651a9a88..e90cd7f134 100644 --- a/library/camellia.c +++ b/library/camellia.c @@ -32,9 +32,7 @@ #include -#if defined(MBEDTLS_SELF_TEST) #include "mbedtls/platform.h" -#endif /* MBEDTLS_SELF_TEST */ #if !defined(MBEDTLS_CAMELLIA_ALT) diff --git a/library/chacha20.c b/library/chacha20.c index f92e5074a7..44d1612bfe 100644 --- a/library/chacha20.c +++ b/library/chacha20.c @@ -32,9 +32,7 @@ #include #include -#if defined(MBEDTLS_SELF_TEST) #include "mbedtls/platform.h" -#endif /* MBEDTLS_SELF_TEST */ #if !defined(MBEDTLS_CHACHA20_ALT) diff --git a/library/chachapoly.c b/library/chachapoly.c index 9ae043b3b5..4adf846857 100644 --- a/library/chachapoly.c +++ b/library/chachapoly.c @@ -28,9 +28,7 @@ #include -#if defined(MBEDTLS_SELF_TEST) #include "mbedtls/platform.h" -#endif /* MBEDTLS_SELF_TEST */ #if !defined(MBEDTLS_CHACHAPOLY_ALT) diff --git a/library/ctr_drbg.c b/library/ctr_drbg.c index d55f9a4795..71c48afd28 100644 --- a/library/ctr_drbg.c +++ b/library/ctr_drbg.c @@ -36,9 +36,7 @@ #include #endif -#if defined(MBEDTLS_SELF_TEST) #include "mbedtls/platform.h" -#endif /* MBEDTLS_SELF_TEST */ /* * CTR_DRBG context initialization diff --git a/library/des.c b/library/des.c index 0576099ce8..65f5681cf1 100644 --- a/library/des.c +++ b/library/des.c @@ -33,9 +33,7 @@ #include -#if defined(MBEDTLS_SELF_TEST) #include "mbedtls/platform.h" -#endif /* MBEDTLS_SELF_TEST */ #if !defined(MBEDTLS_DES_ALT) diff --git a/library/entropy.c b/library/entropy.c index 12184d6704..1e0d9d3281 100644 --- a/library/entropy.c +++ b/library/entropy.c @@ -34,9 +34,7 @@ #include "mbedtls/platform.h" -#if defined(MBEDTLS_SELF_TEST) #include "mbedtls/platform.h" -#endif /* MBEDTLS_SELF_TEST */ #define ENTROPY_MAX_LOOP 256 /**< Maximum amount to loop before error */ diff --git a/library/hmac_drbg.c b/library/hmac_drbg.c index 3c89f5749d..6bc679dd25 100644 --- a/library/hmac_drbg.c +++ b/library/hmac_drbg.c @@ -37,9 +37,7 @@ #include #endif -#if defined(MBEDTLS_SELF_TEST) #include "mbedtls/platform.h" -#endif /* MBEDTLS_PLATFORM_C */ /* * HMAC_DRBG context initialization diff --git a/library/md5.c b/library/md5.c index a01b6dd299..f7a225c1d3 100644 --- a/library/md5.c +++ b/library/md5.c @@ -32,9 +32,7 @@ #include -#if defined(MBEDTLS_SELF_TEST) #include "mbedtls/platform.h" -#endif /* MBEDTLS_SELF_TEST */ #if !defined(MBEDTLS_MD5_ALT) diff --git a/library/nist_kw.c b/library/nist_kw.c index 6be6998dcf..495c23d06a 100644 --- a/library/nist_kw.c +++ b/library/nist_kw.c @@ -39,9 +39,7 @@ #include #include -#if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C) #include "mbedtls/platform.h" -#endif /* MBEDTLS_SELF_TEST && MBEDTLS_AES_C */ #if !defined(MBEDTLS_NIST_KW_ALT) diff --git a/library/poly1305.c b/library/poly1305.c index a2b223303d..f38f48a457 100644 --- a/library/poly1305.c +++ b/library/poly1305.c @@ -28,9 +28,7 @@ #include -#if defined(MBEDTLS_SELF_TEST) #include "mbedtls/platform.h" -#endif /* MBEDTLS_SELF_TEST */ #if !defined(MBEDTLS_POLY1305_ALT) diff --git a/library/ripemd160.c b/library/ripemd160.c index 1c7e17ff36..6212cb2572 100644 --- a/library/ripemd160.c +++ b/library/ripemd160.c @@ -33,9 +33,7 @@ #include -#if defined(MBEDTLS_SELF_TEST) #include "mbedtls/platform.h" -#endif /* MBEDTLS_SELF_TEST */ #if !defined(MBEDTLS_RIPEMD160_ALT) diff --git a/library/sha1.c b/library/sha1.c index 4f65e23fd8..83c984fe0a 100644 --- a/library/sha1.c +++ b/library/sha1.c @@ -32,9 +32,7 @@ #include -#if defined(MBEDTLS_SELF_TEST) #include "mbedtls/platform.h" -#endif /* MBEDTLS_SELF_TEST */ #define SHA1_VALIDATE_RET(cond) \ MBEDTLS_INTERNAL_VALIDATE_RET( cond, MBEDTLS_ERR_SHA1_BAD_INPUT_DATA ) diff --git a/library/sha256.c b/library/sha256.c index 2e65e6fd85..6596a3dfc5 100644 --- a/library/sha256.c +++ b/library/sha256.c @@ -32,9 +32,7 @@ #include -#if defined(MBEDTLS_SELF_TEST) #include "mbedtls/platform.h" -#endif /* MBEDTLS_SELF_TEST */ #if defined(__aarch64__) # if defined(MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT) || \ diff --git a/library/sha512.c b/library/sha512.c index beb548acea..ae2c2262c7 100644 --- a/library/sha512.c +++ b/library/sha512.c @@ -38,9 +38,7 @@ #include -#if defined(MBEDTLS_SELF_TEST) #include "mbedtls/platform.h" -#endif /* MBEDTLS_SELF_TEST */ #if defined(__aarch64__) # if defined(MBEDTLS_SHA512_USE_A64_CRYPTO_IF_PRESENT) || \