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 <Gilles.Peskine@arm.com>
diff --git a/library/aes.c b/library/aes.c
index 872930f..a48658f 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 cfa69c2..f78d289 100644
--- a/library/aria.c
+++ b/library/aria.c
@@ -31,9 +31,7 @@
#include <string.h>
-#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 24651a9..e90cd7f 100644
--- a/library/camellia.c
+++ b/library/camellia.c
@@ -32,9 +32,7 @@
#include <string.h>
-#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 f92e507..44d1612 100644
--- a/library/chacha20.c
+++ b/library/chacha20.c
@@ -32,9 +32,7 @@
#include <stddef.h>
#include <string.h>
-#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 9ae043b..4adf846 100644
--- a/library/chachapoly.c
+++ b/library/chachapoly.c
@@ -28,9 +28,7 @@
#include <string.h>
-#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 d55f9a4..71c48af 100644
--- a/library/ctr_drbg.c
+++ b/library/ctr_drbg.c
@@ -36,9 +36,7 @@
#include <stdio.h>
#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 0576099..65f5681 100644
--- a/library/des.c
+++ b/library/des.c
@@ -33,9 +33,7 @@
#include <string.h>
-#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 12184d6..1e0d9d3 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 3c89f57..6bc679d 100644
--- a/library/hmac_drbg.c
+++ b/library/hmac_drbg.c
@@ -37,9 +37,7 @@
#include <stdio.h>
#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 a01b6dd..f7a225c 100644
--- a/library/md5.c
+++ b/library/md5.c
@@ -32,9 +32,7 @@
#include <string.h>
-#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 6be6998..495c23d 100644
--- a/library/nist_kw.c
+++ b/library/nist_kw.c
@@ -39,9 +39,7 @@
#include <stdint.h>
#include <string.h>
-#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 a2b2233..f38f48a 100644
--- a/library/poly1305.c
+++ b/library/poly1305.c
@@ -28,9 +28,7 @@
#include <string.h>
-#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 1c7e17f..6212cb2 100644
--- a/library/ripemd160.c
+++ b/library/ripemd160.c
@@ -33,9 +33,7 @@
#include <string.h>
-#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 4f65e23..83c984f 100644
--- a/library/sha1.c
+++ b/library/sha1.c
@@ -32,9 +32,7 @@
#include <string.h>
-#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 2e65e6f..6596a3d 100644
--- a/library/sha256.c
+++ b/library/sha256.c
@@ -32,9 +32,7 @@
#include <string.h>
-#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 beb548a..ae2c226 100644
--- a/library/sha512.c
+++ b/library/sha512.c
@@ -38,9 +38,7 @@
#include <string.h>
-#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) || \