cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-09-16 10:37:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Include platform.h unconditionally: second automatic part

Browse Source 
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>
This commit is contained in:
Gilles Peskine 2022-10-05 11:49:12 +02:00
parent 36f19b97e2
commit 8474fe072b
21 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/aes.c
View File

@ -40,9 +40,7 @@
#include "mbedtls/aesni.h" #include "mbedtls/aesni.h"
#endif #endif
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
#if !defined(MBEDTLS_AES_ALT) #if !defined(MBEDTLS_AES_ALT)

2
library/arc4.c
View File

@ -31,9 +31,7 @@
#include <string.h> #include <string.h>
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
#if !defined(MBEDTLS_ARC4_ALT) #if !defined(MBEDTLS_ARC4_ALT)

2
library/aria.c
View File

@ -31,9 +31,7 @@
#include <string.h> #include <string.h>
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
#if !defined(MBEDTLS_ARIA_ALT) #if !defined(MBEDTLS_ARIA_ALT)

2
library/camellia.c
View File

@ -32,9 +32,7 @@
#include <string.h> #include <string.h>
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
#if !defined(MBEDTLS_CAMELLIA_ALT) #if !defined(MBEDTLS_CAMELLIA_ALT)

2
library/ccm.c
View File

@ -36,9 +36,7 @@
#include <string.h> #include <string.h>
#if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST && MBEDTLS_AES_C */
#if !defined(MBEDTLS_CCM_ALT) #if !defined(MBEDTLS_CCM_ALT)

2
library/chacha20.c
View File

@ -32,9 +32,7 @@
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
#if !defined(MBEDTLS_CHACHA20_ALT) #if !defined(MBEDTLS_CHACHA20_ALT)

2
library/chachapoly.c
View File

@ -28,9 +28,7 @@
#include <string.h> #include <string.h>
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
#if !defined(MBEDTLS_CHACHAPOLY_ALT) #if !defined(MBEDTLS_CHACHAPOLY_ALT)

2
library/ctr_drbg.c
View File

@ -36,9 +36,7 @@
#include <stdio.h> #include <stdio.h>
#endif #endif
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
/* /*
* CTR_DRBG context initialization * CTR_DRBG context initialization

2
library/des.c
View File

@ -33,9 +33,7 @@
#include <string.h> #include <string.h>
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
#if !defined(MBEDTLS_DES_ALT) #if !defined(MBEDTLS_DES_ALT)

2
library/entropy.c
View File

@ -40,9 +40,7 @@
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
#if defined(MBEDTLS_HAVEGE_C) #if defined(MBEDTLS_HAVEGE_C)
#include "mbedtls/havege.h" #include "mbedtls/havege.h"

2
library/hmac_drbg.c
View File

@ -37,9 +37,7 @@
#include <stdio.h> #include <stdio.h>
#endif #endif
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_PLATFORM_C */
/* /*
* HMAC_DRBG context initialization * HMAC_DRBG context initialization

2
library/md2.c
View File

@ -33,9 +33,7 @@
#include <string.h> #include <string.h>
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
#if !defined(MBEDTLS_MD2_ALT) #if !defined(MBEDTLS_MD2_ALT)

2
library/md4.c
View File

@ -33,9 +33,7 @@
#include <string.h> #include <string.h>
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
#if !defined(MBEDTLS_MD4_ALT) #if !defined(MBEDTLS_MD4_ALT)

2
library/md5.c
View File

@ -32,9 +32,7 @@
#include <string.h> #include <string.h>
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
#if !defined(MBEDTLS_MD5_ALT) #if !defined(MBEDTLS_MD5_ALT)

2
library/nist_kw.c
View File

@ -39,9 +39,7 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST && MBEDTLS_AES_C */
#if !defined(MBEDTLS_NIST_KW_ALT) #if !defined(MBEDTLS_NIST_KW_ALT)

2
library/poly1305.c
View File

@ -28,9 +28,7 @@
#include <string.h> #include <string.h>
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
#if !defined(MBEDTLS_POLY1305_ALT) #if !defined(MBEDTLS_POLY1305_ALT)

2
library/ripemd160.c
View File

@ -33,9 +33,7 @@
#include <string.h> #include <string.h>
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
#if !defined(MBEDTLS_RIPEMD160_ALT) #if !defined(MBEDTLS_RIPEMD160_ALT)

2
library/sha1.c
View File

@ -32,9 +32,7 @@
#include <string.h> #include <string.h>
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
#define SHA1_VALIDATE_RET(cond) \ #define SHA1_VALIDATE_RET(cond) \
MBEDTLS_INTERNAL_VALIDATE_RET( cond, MBEDTLS_ERR_SHA1_BAD_INPUT_DATA ) MBEDTLS_INTERNAL_VALIDATE_RET( cond, MBEDTLS_ERR_SHA1_BAD_INPUT_DATA )

2
library/sha256.c
View File

@ -32,9 +32,7 @@
#include <string.h> #include <string.h>
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
#define SHA256_VALIDATE_RET(cond) \ #define SHA256_VALIDATE_RET(cond) \
MBEDTLS_INTERNAL_VALIDATE_RET( cond, MBEDTLS_ERR_SHA256_BAD_INPUT_DATA ) MBEDTLS_INTERNAL_VALIDATE_RET( cond, MBEDTLS_ERR_SHA256_BAD_INPUT_DATA )

2
library/sha512.c
View File

@ -38,9 +38,7 @@
#include <string.h> #include <string.h>
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
#define SHA512_VALIDATE_RET(cond) \ #define SHA512_VALIDATE_RET(cond) \
MBEDTLS_INTERNAL_VALIDATE_RET( cond, MBEDTLS_ERR_SHA512_BAD_INPUT_DATA ) MBEDTLS_INTERNAL_VALIDATE_RET( cond, MBEDTLS_ERR_SHA512_BAD_INPUT_DATA )

2
library/xtea.c
View File

@ -26,9 +26,7 @@
#include <string.h> #include <string.h>
#if defined(MBEDTLS_SELF_TEST)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#endif /* MBEDTLS_SELF_TEST */
#if !defined(MBEDTLS_XTEA_ALT) #if !defined(MBEDTLS_XTEA_ALT)