diff --git a/include/polarssl/aes.h b/include/polarssl/aes.h index 1b3f1e807..4ca69b7cf 100644 --- a/include/polarssl/aes.h +++ b/include/polarssl/aes.h @@ -30,7 +30,7 @@ #include POLARSSL_CONFIG_FILE #endif -#include +#include #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) #include diff --git a/include/polarssl/arc4.h b/include/polarssl/arc4.h index 6c9788c7e..96e520d8b 100644 --- a/include/polarssl/arc4.h +++ b/include/polarssl/arc4.h @@ -30,7 +30,7 @@ #include POLARSSL_CONFIG_FILE #endif -#include +#include #if !defined(POLARSSL_ARC4_ALT) // Regular implementation diff --git a/include/polarssl/asn1.h b/include/polarssl/asn1.h index 0a657e1c2..c723c008b 100644 --- a/include/polarssl/asn1.h +++ b/include/polarssl/asn1.h @@ -30,12 +30,12 @@ #include POLARSSL_CONFIG_FILE #endif +#include + #if defined(POLARSSL_BIGNUM_C) #include "bignum.h" #endif -#include - /** * \addtogroup asn1_module * \{ diff --git a/include/polarssl/base64.h b/include/polarssl/base64.h index 2da935b94..6610a18b4 100644 --- a/include/polarssl/base64.h +++ b/include/polarssl/base64.h @@ -24,7 +24,7 @@ #ifndef POLARSSL_BASE64_H #define POLARSSL_BASE64_H -#include +#include #define POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL -0x002A /**< Output buffer too small. */ #define POLARSSL_ERR_BASE64_INVALID_CHARACTER -0x002C /**< Invalid character in input. */ diff --git a/include/polarssl/bignum.h b/include/polarssl/bignum.h index 8ffd5627f..9e4e05b0d 100644 --- a/include/polarssl/bignum.h +++ b/include/polarssl/bignum.h @@ -24,14 +24,14 @@ #ifndef POLARSSL_BIGNUM_H #define POLARSSL_BIGNUM_H -#include - #if !defined(POLARSSL_CONFIG_FILE) #include "config.h" #else #include POLARSSL_CONFIG_FILE #endif +#include + #if defined(POLARSSL_FS_IO) #include #endif diff --git a/include/polarssl/blowfish.h b/include/polarssl/blowfish.h index a03d6d76a..246b053ea 100644 --- a/include/polarssl/blowfish.h +++ b/include/polarssl/blowfish.h @@ -30,7 +30,7 @@ #include POLARSSL_CONFIG_FILE #endif -#include +#include #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) #include diff --git a/include/polarssl/camellia.h b/include/polarssl/camellia.h index dedfba9c8..c17988eb9 100644 --- a/include/polarssl/camellia.h +++ b/include/polarssl/camellia.h @@ -30,7 +30,7 @@ #include POLARSSL_CONFIG_FILE #endif -#include +#include #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) #include diff --git a/include/polarssl/cipher.h b/include/polarssl/cipher.h index 999d24b50..e291ef67d 100644 --- a/include/polarssl/cipher.h +++ b/include/polarssl/cipher.h @@ -33,6 +33,8 @@ #include POLARSSL_CONFIG_FILE #endif +#include + #if defined(POLARSSL_GCM_C) || defined(POLARSSL_CCM_C) #define POLARSSL_CIPHER_MODE_AEAD #endif @@ -41,8 +43,6 @@ #define POLARSSL_CIPHER_MODE_WITH_PADDING #endif -#include - #if defined(_MSC_VER) && !defined(inline) #define inline _inline #else diff --git a/include/polarssl/cipher_wrap.h b/include/polarssl/cipher_wrap.h index 94ba5785f..ffa8c53bd 100644 --- a/include/polarssl/cipher_wrap.h +++ b/include/polarssl/cipher_wrap.h @@ -31,6 +31,7 @@ #else #include POLARSSL_CONFIG_FILE #endif + #include "cipher.h" #ifdef __cplusplus diff --git a/include/polarssl/ctr_drbg.h b/include/polarssl/ctr_drbg.h index 1424bd741..c473e76d6 100644 --- a/include/polarssl/ctr_drbg.h +++ b/include/polarssl/ctr_drbg.h @@ -24,8 +24,6 @@ #ifndef POLARSSL_CTR_DRBG_H #define POLARSSL_CTR_DRBG_H -#include - #include "aes.h" #define POLARSSL_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED -0x0034 /**< The entropy source failed. */ diff --git a/include/polarssl/debug.h b/include/polarssl/debug.h index a9d00f5ef..a4d2bdb9e 100644 --- a/include/polarssl/debug.h +++ b/include/polarssl/debug.h @@ -29,7 +29,9 @@ #else #include POLARSSL_CONFIG_FILE #endif + #include "ssl.h" + #if defined(POLARSSL_ECP_C) #include "ecp.h" #endif diff --git a/include/polarssl/des.h b/include/polarssl/des.h index b18ca0307..3155e5ec5 100644 --- a/include/polarssl/des.h +++ b/include/polarssl/des.h @@ -30,7 +30,7 @@ #include POLARSSL_CONFIG_FILE #endif -#include +#include #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) #include diff --git a/include/polarssl/entropy.h b/include/polarssl/entropy.h index 92aa5a5be..53a1f0e25 100644 --- a/include/polarssl/entropy.h +++ b/include/polarssl/entropy.h @@ -24,14 +24,14 @@ #ifndef POLARSSL_ENTROPY_H #define POLARSSL_ENTROPY_H -#include - #if !defined(POLARSSL_CONFIG_FILE) #include "config.h" #else #include POLARSSL_CONFIG_FILE #endif +#include + #if defined(POLARSSL_SHA512_C) && !defined(POLARSSL_ENTROPY_FORCE_SHA256) #include "sha512.h" #define POLARSSL_ENTROPY_SHA512_ACCUMULATOR diff --git a/include/polarssl/entropy_poll.h b/include/polarssl/entropy_poll.h index 9c349da2a..523a7cd4e 100644 --- a/include/polarssl/entropy_poll.h +++ b/include/polarssl/entropy_poll.h @@ -24,14 +24,14 @@ #ifndef POLARSSL_ENTROPY_POLL_H #define POLARSSL_ENTROPY_POLL_H -#include - #if !defined(POLARSSL_CONFIG_FILE) #include "config.h" #else #include POLARSSL_CONFIG_FILE #endif +#include + #ifdef __cplusplus extern "C" { #endif diff --git a/include/polarssl/error.h b/include/polarssl/error.h index b642c0886..da3ef3de9 100644 --- a/include/polarssl/error.h +++ b/include/polarssl/error.h @@ -24,7 +24,7 @@ #ifndef POLARSSL_ERROR_H #define POLARSSL_ERROR_H -#include +#include /** * Error code layout. diff --git a/include/polarssl/havege.h b/include/polarssl/havege.h index 1bad2b95e..df267554b 100644 --- a/include/polarssl/havege.h +++ b/include/polarssl/havege.h @@ -24,7 +24,7 @@ #ifndef POLARSSL_HAVEGE_H #define POLARSSL_HAVEGE_H -#include +#include #define COLLECT_SIZE 1024 diff --git a/include/polarssl/md.h b/include/polarssl/md.h index 33a67a332..3bbff6e77 100644 --- a/include/polarssl/md.h +++ b/include/polarssl/md.h @@ -26,7 +26,7 @@ #ifndef POLARSSL_MD_H #define POLARSSL_MD_H -#include +#include #if defined(_MSC_VER) && !defined(inline) #define inline _inline diff --git a/include/polarssl/md2.h b/include/polarssl/md2.h index 6727ed26f..842603748 100644 --- a/include/polarssl/md2.h +++ b/include/polarssl/md2.h @@ -30,7 +30,7 @@ #include POLARSSL_CONFIG_FILE #endif -#include +#include #define POLARSSL_ERR_MD2_FILE_IO_ERROR -0x0070 /**< Read/write error in file. */ diff --git a/include/polarssl/md4.h b/include/polarssl/md4.h index 774300d93..9fc7c861c 100644 --- a/include/polarssl/md4.h +++ b/include/polarssl/md4.h @@ -30,7 +30,7 @@ #include POLARSSL_CONFIG_FILE #endif -#include +#include #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) #include diff --git a/include/polarssl/md5.h b/include/polarssl/md5.h index 6566eb3ff..50c7774bf 100644 --- a/include/polarssl/md5.h +++ b/include/polarssl/md5.h @@ -30,7 +30,7 @@ #include POLARSSL_CONFIG_FILE #endif -#include +#include #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) #include diff --git a/include/polarssl/md_wrap.h b/include/polarssl/md_wrap.h index 7aeb27a84..2cb6e5116 100644 --- a/include/polarssl/md_wrap.h +++ b/include/polarssl/md_wrap.h @@ -31,6 +31,7 @@ #else #include POLARSSL_CONFIG_FILE #endif + #include "md.h" #ifdef __cplusplus diff --git a/include/polarssl/memory_buffer_alloc.h b/include/polarssl/memory_buffer_alloc.h index 5f8e32970..ab36b416c 100644 --- a/include/polarssl/memory_buffer_alloc.h +++ b/include/polarssl/memory_buffer_alloc.h @@ -30,7 +30,7 @@ #include POLARSSL_CONFIG_FILE #endif -#include +#include /** * \name SECTION: Module settings diff --git a/include/polarssl/net.h b/include/polarssl/net.h index d86732f10..5f0b9ca67 100644 --- a/include/polarssl/net.h +++ b/include/polarssl/net.h @@ -24,7 +24,7 @@ #ifndef POLARSSL_NET_H #define POLARSSL_NET_H -#include +#include #define POLARSSL_ERR_NET_UNKNOWN_HOST -0x0056 /**< Failed to get an IP address for the given hostname. */ #define POLARSSL_ERR_NET_SOCKET_FAILED -0x0042 /**< Failed to open a socket. */ diff --git a/include/polarssl/oid.h b/include/polarssl/oid.h index 309d8c518..497eac82c 100644 --- a/include/polarssl/oid.h +++ b/include/polarssl/oid.h @@ -24,14 +24,17 @@ #ifndef POLARSSL_OID_H #define POLARSSL_OID_H -#include #if !defined(POLARSSL_CONFIG_FILE) #include "config.h" #else #include POLARSSL_CONFIG_FILE #endif + #include "asn1.h" #include "pk.h" + +#include + #if defined(POLARSSL_CIPHER_C) #include "cipher.h" #endif diff --git a/include/polarssl/padlock.h b/include/polarssl/padlock.h index af84d6348..185eff8ff 100644 --- a/include/polarssl/padlock.h +++ b/include/polarssl/padlock.h @@ -42,7 +42,6 @@ typedef INT32 int32_t; #include #endif - #define PADLOCK_RNG 0x000C #define PADLOCK_ACE 0x00C0 #define PADLOCK_PHE 0x0C00 diff --git a/include/polarssl/pbkdf2.h b/include/polarssl/pbkdf2.h index 0548ad032..7c98eaece 100644 --- a/include/polarssl/pbkdf2.h +++ b/include/polarssl/pbkdf2.h @@ -27,10 +27,10 @@ #ifndef POLARSSL_PBKDF2_H #define POLARSSL_PBKDF2_H -#include - #include "md.h" +#include + #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) #include typedef UINT32 uint32_t; diff --git a/include/polarssl/pem.h b/include/polarssl/pem.h index c0775d05e..9ccdbef21 100644 --- a/include/polarssl/pem.h +++ b/include/polarssl/pem.h @@ -24,7 +24,7 @@ #ifndef POLARSSL_PEM_H #define POLARSSL_PEM_H -#include +#include /** * \name PEM Error codes diff --git a/include/polarssl/pkcs12.h b/include/polarssl/pkcs12.h index 4a1310250..0920cd167 100644 --- a/include/polarssl/pkcs12.h +++ b/include/polarssl/pkcs12.h @@ -24,12 +24,12 @@ #ifndef POLARSSL_PKCS12_H #define POLARSSL_PKCS12_H -#include - #include "md.h" #include "cipher.h" #include "asn1.h" +#include + #define POLARSSL_ERR_PKCS12_BAD_INPUT_DATA -0x1F80 /**< Bad input parameters to function. */ #define POLARSSL_ERR_PKCS12_FEATURE_UNAVAILABLE -0x1F00 /**< Feature not available, e.g. unsupported encryption scheme. */ #define POLARSSL_ERR_PKCS12_PBE_INVALID_FORMAT -0x1E80 /**< PBE ASN.1 data not as expected. */ diff --git a/include/polarssl/pkcs5.h b/include/polarssl/pkcs5.h index d9b6856b1..fda40b52f 100644 --- a/include/polarssl/pkcs5.h +++ b/include/polarssl/pkcs5.h @@ -26,11 +26,11 @@ #ifndef POLARSSL_PKCS5_H #define POLARSSL_PKCS5_H -#include - #include "asn1.h" #include "md.h" +#include + #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) #include typedef UINT32 uint32_t; diff --git a/include/polarssl/platform.h b/include/polarssl/platform.h index 4473d5051..127b7fe3e 100644 --- a/include/polarssl/platform.h +++ b/include/polarssl/platform.h @@ -35,8 +35,6 @@ #define POLARSSL_PLATFORM_MEMORY #endif -#include - #ifdef __cplusplus extern "C" { #endif @@ -50,6 +48,7 @@ extern "C" { */ #if !defined(POLARSSL_PLATFORM_NO_STD_FUNCTIONS) +#include #include #if !defined(POLARSSL_PLATFORM_STD_PRINTF) #define POLARSSL_PLATFORM_STD_PRINTF printf /**< Default printf to use */ @@ -88,10 +87,10 @@ extern void (*polarssl_free)( void *ptr ); */ int platform_set_malloc_free( void * (*malloc_func)( size_t ), void (*free_func)( void * ) ); -#else /* POLARSSL_PLATFORM_ENTROPY */ +#else /* !POLARSSL_PLATFORM_MEMORY */ #define polarssl_malloc malloc #define polarssl_free free -#endif /* POLARSSL_PLATFORM_ENTROPY */ +#endif /* POLARSSL_PLATFORM_MEMORY */ /* * The function pointers for printf diff --git a/include/polarssl/ripemd160.h b/include/polarssl/ripemd160.h index 49c36c04c..4762720fa 100644 --- a/include/polarssl/ripemd160.h +++ b/include/polarssl/ripemd160.h @@ -30,7 +30,7 @@ #include POLARSSL_CONFIG_FILE #endif -#include +#include #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) #include diff --git a/include/polarssl/sha1.h b/include/polarssl/sha1.h index 258a3de22..849750110 100644 --- a/include/polarssl/sha1.h +++ b/include/polarssl/sha1.h @@ -30,7 +30,7 @@ #include POLARSSL_CONFIG_FILE #endif -#include +#include #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) #include diff --git a/include/polarssl/sha256.h b/include/polarssl/sha256.h index 195996dbb..b7362dd83 100644 --- a/include/polarssl/sha256.h +++ b/include/polarssl/sha256.h @@ -30,7 +30,7 @@ #include POLARSSL_CONFIG_FILE #endif -#include +#include #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) #include diff --git a/include/polarssl/sha512.h b/include/polarssl/sha512.h index 6afb8367c..90b5e3e54 100644 --- a/include/polarssl/sha512.h +++ b/include/polarssl/sha512.h @@ -30,7 +30,7 @@ #include POLARSSL_CONFIG_FILE #endif -#include +#include #if defined(_MSC_VER) || defined(__WATCOMC__) #define UL64(x) x##ui64 diff --git a/include/polarssl/x509_crt.h b/include/polarssl/x509_crt.h index 4fad932bf..ab6b1645b 100644 --- a/include/polarssl/x509_crt.h +++ b/include/polarssl/x509_crt.h @@ -31,7 +31,6 @@ #endif #include "x509.h" - #include "x509_crl.h" /** diff --git a/include/polarssl/xtea.h b/include/polarssl/xtea.h index 0c58ab543..f055490ec 100644 --- a/include/polarssl/xtea.h +++ b/include/polarssl/xtea.h @@ -30,7 +30,7 @@ #include POLARSSL_CONFIG_FILE #endif -#include +#include #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) #include diff --git a/library/aes.c b/library/aes.c index c579d7800..69505ef4d 100644 --- a/library/aes.c +++ b/library/aes.c @@ -34,6 +34,8 @@ #if defined(POLARSSL_AES_C) +#include + #include "polarssl/aes.h" #if defined(POLARSSL_PADLOCK_C) #include "polarssl/padlock.h" @@ -42,11 +44,14 @@ #include "polarssl/aesni.h" #endif +#if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf -#endif +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_SELF_TEST */ #if !defined(POLARSSL_AES_ALT) @@ -926,7 +931,6 @@ int aes_crypt_cfb128( aes_context *ctx, /* * AES-CFB8 buffer encryption/decryption */ -#include int aes_crypt_cfb8( aes_context *ctx, int mode, size_t length, @@ -996,9 +1000,6 @@ int aes_crypt_ctr( aes_context *ctx, #endif /* !POLARSSL_AES_ALT */ #if defined(POLARSSL_SELF_TEST) - -#include - /* * AES test vectors from: * diff --git a/library/aesni.c b/library/aesni.c index d4ec9ecb1..a235904ee 100644 --- a/library/aesni.c +++ b/library/aesni.c @@ -34,7 +34,8 @@ #if defined(POLARSSL_AESNI_C) #include "polarssl/aesni.h" -#include + +#include #if defined(POLARSSL_HAVE_X86_64) diff --git a/library/arc4.c b/library/arc4.c index ef0e7f89a..90970ef7e 100644 --- a/library/arc4.c +++ b/library/arc4.c @@ -35,11 +35,16 @@ #include "polarssl/arc4.h" +#include + +#if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf -#endif +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_SELF_TEST */ #if !defined(POLARSSL_ARC4_ALT) @@ -126,10 +131,6 @@ int arc4_crypt( arc4_context *ctx, size_t length, const unsigned char *input, #endif /* !POLARSSL_ARC4_ALT */ #if defined(POLARSSL_SELF_TEST) - -#include -#include - /* * ARC4 tests vectors as posted by Eric Rescorla in sep. 1994: * diff --git a/library/asn1parse.c b/library/asn1parse.c index 7e8fc32fa..678214045 100644 --- a/library/asn1parse.c +++ b/library/asn1parse.c @@ -30,6 +30,8 @@ #include "polarssl/asn1.h" +#include + #if defined(POLARSSL_BIGNUM_C) #include "polarssl/bignum.h" #endif @@ -37,13 +39,11 @@ #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_malloc malloc #define polarssl_free free #endif -#include -#include - /* Implementation that should never be optimized out by the compiler */ static void polarssl_zeroize( void *v, size_t n ) { volatile unsigned char *p = v; while( n-- ) *p++ = 0; diff --git a/library/asn1write.c b/library/asn1write.c index 8d92888b8..efdd64892 100644 --- a/library/asn1write.c +++ b/library/asn1write.c @@ -30,6 +30,8 @@ #include "polarssl/asn1write.h" +#include + #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else diff --git a/library/base64.c b/library/base64.c index 21cd3a6ce..684c537eb 100644 --- a/library/base64.c +++ b/library/base64.c @@ -37,11 +37,15 @@ typedef UINT32 uint32_t; #include #endif +#if defined(POLARSSL_SELF_TEST) +#include #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf -#endif +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_SELF_TEST */ static const unsigned char base64_enc_map[64] = { @@ -221,9 +225,6 @@ int base64_decode( unsigned char *dst, size_t *dlen, #if defined(POLARSSL_SELF_TEST) -#include -#include - static const unsigned char base64_test_dec[64] = { 0x24, 0x48, 0x6E, 0x56, 0x87, 0x62, 0x5A, 0xBD, diff --git a/library/bignum.c b/library/bignum.c index 0eb95ee4e..91cbf2987 100644 --- a/library/bignum.c +++ b/library/bignum.c @@ -38,16 +38,18 @@ #include "polarssl/bignum.h" #include "polarssl/bn_mul.h" +#include + #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include +#include #define polarssl_printf printf #define polarssl_malloc malloc #define polarssl_free free #endif -#include - /* Implementation that should never be optimized out by the compiler */ static void polarssl_zeroize( void *v, size_t n ) { volatile unsigned char *p = v; while( n-- ) *p++ = 0; diff --git a/library/blowfish.c b/library/blowfish.c index 4bbaaf205..07cd060b4 100644 --- a/library/blowfish.c +++ b/library/blowfish.c @@ -36,6 +36,8 @@ #include "polarssl/blowfish.h" +#include + #if !defined(POLARSSL_BLOWFISH_ALT) /* Implementation that should never be optimized out by the compiler */ diff --git a/library/camellia.c b/library/camellia.c index 92f74faad..826d8834f 100644 --- a/library/camellia.c +++ b/library/camellia.c @@ -36,11 +36,15 @@ #include "polarssl/camellia.h" +#if defined(POLARSSL_SELF_TEST) +#include #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf -#endif +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_SELF_TEST */ #if !defined(POLARSSL_CAMELLIA_ALT) @@ -689,8 +693,6 @@ int camellia_crypt_ctr( camellia_context *ctx, #if defined(POLARSSL_SELF_TEST) -#include - /* * Camellia test vectors from: * diff --git a/library/ccm.c b/library/ccm.c index 8590c2970..bfa9ed9e3 100644 --- a/library/ccm.c +++ b/library/ccm.c @@ -39,6 +39,17 @@ #include "polarssl/ccm.h" +#include + +#if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_AES_C) +#if defined(POLARSSL_PLATFORM_C) +#include "polarssl/platform.h" +#else +#include +#define polarssl_printf printf +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_SELF_TEST && POLARSSL_AES_C */ + /* Implementation that should never be optimized out by the compiler */ static void polarssl_zeroize( void *v, size_t n ) { volatile unsigned char *p = v; while( n-- ) *p++ = 0; @@ -333,14 +344,6 @@ int ccm_auth_decrypt( ccm_context *ctx, size_t length, #if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_AES_C) - -#if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" -#else -#include -#define polarssl_printf printf -#endif - /* * Examples 1 to 3 from SP800-38C Appendix C */ diff --git a/library/cipher.c b/library/cipher.c index 2f886d987..b98b4a2b9 100644 --- a/library/cipher.c +++ b/library/cipher.c @@ -35,6 +35,9 @@ #include "polarssl/cipher.h" #include "polarssl/cipher_wrap.h" +#include +#include + #if defined(POLARSSL_GCM_C) #include "polarssl/gcm.h" #endif @@ -43,8 +46,6 @@ #include "polarssl/ccm.h" #endif -#include - #if defined(POLARSSL_ARC4_C) || defined(POLARSSL_CIPHER_NULL_CIPHER) #define POLARSSL_CIPHER_MODE_STREAM #endif diff --git a/library/cipher_wrap.c b/library/cipher_wrap.c index e289aa2e9..b623b3c59 100644 --- a/library/cipher_wrap.c +++ b/library/cipher_wrap.c @@ -65,12 +65,11 @@ #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_malloc malloc #define polarssl_free free #endif -#include - #if defined(POLARSSL_GCM_C) /* shared by all GCM ciphers */ static void *gcm_ctx_alloc( void ) diff --git a/library/ctr_drbg.c b/library/ctr_drbg.c index 5e6384809..4fc1deb0d 100644 --- a/library/ctr_drbg.c +++ b/library/ctr_drbg.c @@ -35,15 +35,20 @@ #include "polarssl/ctr_drbg.h" +#include + #if defined(POLARSSL_FS_IO) #include #endif +#if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf -#endif +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_SELF_TEST */ /* Implementation that should never be optimized out by the compiler */ static void polarssl_zeroize( void *v, size_t n ) { @@ -443,8 +448,6 @@ int ctr_drbg_update_seed_file( ctr_drbg_context *ctx, const char *path ) #if defined(POLARSSL_SELF_TEST) -#include - static unsigned char entropy_source_pr[96] = { 0xc1, 0x80, 0x81, 0xa6, 0x5d, 0x44, 0x02, 0x16, 0x19, 0xb3, 0xf1, 0x80, 0xb1, 0xc9, 0x20, 0x02, diff --git a/library/debug.c b/library/debug.c index 24c5e7040..f327baab9 100644 --- a/library/debug.c +++ b/library/debug.c @@ -31,8 +31,8 @@ #include "polarssl/debug.h" #include -#include #include +#include #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) #if !defined snprintf diff --git a/library/des.c b/library/des.c index 6e08cf2c1..16a2e74fc 100644 --- a/library/des.c +++ b/library/des.c @@ -36,11 +36,16 @@ #include "polarssl/des.h" +#include + +#if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf -#endif +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_SELF_TEST */ #if !defined(POLARSSL_DES_ALT) @@ -802,9 +807,6 @@ int des3_crypt_cbc( des3_context *ctx, #endif /* !POLARSSL_DES_ALT */ #if defined(POLARSSL_SELF_TEST) - -#include - /* * DES and 3DES test vectors from: * diff --git a/library/dhm.c b/library/dhm.c index fb7826aaf..5861f9462 100644 --- a/library/dhm.c +++ b/library/dhm.c @@ -35,6 +35,8 @@ #include "polarssl/dhm.h" +#include + #if defined(POLARSSL_PEM_PARSE_C) #include "polarssl/pem.h" #endif diff --git a/library/ecdh.c b/library/ecdh.c index 21823c651..d28794806 100644 --- a/library/ecdh.c +++ b/library/ecdh.c @@ -37,6 +37,8 @@ #include "polarssl/ecdh.h" +#include + /* * Generate public key: simple wrapper around ecp_gen_keypair */ diff --git a/library/ecdsa.c b/library/ecdsa.c index 5b62939b0..60dd427c8 100644 --- a/library/ecdsa.c +++ b/library/ecdsa.c @@ -37,6 +37,8 @@ #include "polarssl/ecdsa.h" #include "polarssl/asn1write.h" +#include + #if defined(POLARSSL_ECDSA_DETERMINISTIC) #include "polarssl/hmac_drbg.h" #endif diff --git a/library/ecp.c b/library/ecp.c index aca3a2d2c..1bb8dfe25 100644 --- a/library/ecp.c +++ b/library/ecp.c @@ -51,16 +51,17 @@ #include "polarssl/ecp.h" +#include + #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf #define polarssl_malloc malloc #define polarssl_free free #endif -#include - #if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \ !defined(EFI32) #define strcasecmp _stricmp diff --git a/library/ecp_curves.c b/library/ecp_curves.c index 0464e7d72..0659111a7 100644 --- a/library/ecp_curves.c +++ b/library/ecp_curves.c @@ -30,6 +30,8 @@ #include "polarssl/ecp.h" +#include + #if defined(_MSC_VER) && !defined(inline) #define inline _inline #else diff --git a/library/entropy.c b/library/entropy.c index 7604e0f27..846d5ee4c 100644 --- a/library/entropy.c +++ b/library/entropy.c @@ -31,10 +31,21 @@ #include "polarssl/entropy.h" #include "polarssl/entropy_poll.h" +#include + #if defined(POLARSSL_FS_IO) #include #endif +#if defined(POLARSSL_SELF_TEST) +#if defined(POLARSSL_PLATFORM_C) +#include "polarssl/platform.h" +#else +#include +#define polarssl_printf printf +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_SELF_TEST */ + #if defined(POLARSSL_HAVEGE_C) #include "polarssl/havege.h" #endif @@ -378,14 +389,6 @@ int entropy_update_seed_file( entropy_context *ctx, const char *path ) #endif /* POLARSSL_FS_IO */ #if defined(POLARSSL_SELF_TEST) - -#if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" -#else -#include -#define polarssl_printf printf -#endif - /* * Dummy source function */ diff --git a/library/entropy_poll.c b/library/entropy_poll.c index 467268c45..8d98d895a 100644 --- a/library/entropy_poll.c +++ b/library/entropy_poll.c @@ -32,6 +32,7 @@ #include "polarssl/entropy_poll.h" #if defined(POLARSSL_TIMING_C) +#include #include "polarssl/timing.h" #endif #if defined(POLARSSL_HAVEGE_C) diff --git a/library/error.c b/library/error.c index a4e6fc31c..1be54e8b5 100644 --- a/library/error.c +++ b/library/error.c @@ -28,10 +28,13 @@ #if defined(POLARSSL_ERROR_C) || defined(POLARSSL_ERROR_STRERROR_DUMMY) #include "polarssl/error.h" +#include #endif #if defined(POLARSSL_ERROR_C) +#include + #if defined(POLARSSL_AES_C) #include "polarssl/aes.h" #endif @@ -172,9 +175,6 @@ #include "polarssl/xtea.h" #endif -#include -#include - #if defined(_MSC_VER) && !defined snprintf && !defined(EFIX64) && \ !defined(EFI32) #define snprintf _snprintf @@ -746,8 +746,6 @@ void error_strerror( int ret, char *buf, size_t buflen ) #if defined(POLARSSL_ERROR_STRERROR_DUMMY) -#include - /* * Provide an non-function in case POLARSSL_ERROR_C is not defined */ diff --git a/library/gcm.c b/library/gcm.c index 415e53af9..39cb189a4 100644 --- a/library/gcm.c +++ b/library/gcm.c @@ -40,15 +40,20 @@ #include "polarssl/gcm.h" +#include + #if defined(POLARSSL_AESNI_C) #include "polarssl/aesni.h" #endif +#if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_AES_C) #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf -#endif +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_SELF_TEST && POLARSSL_AES_C */ /* * 32-bit integer manipulation macros (big endian) @@ -496,9 +501,6 @@ void gcm_free( gcm_context *ctx ) } #if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_AES_C) - -#include - /* * AES-GCM test vectors from: * diff --git a/library/hmac_drbg.c b/library/hmac_drbg.c index ed06cce83..551630149 100644 --- a/library/hmac_drbg.c +++ b/library/hmac_drbg.c @@ -36,15 +36,20 @@ #include "polarssl/hmac_drbg.h" +#include + #if defined(POLARSSL_FS_IO) #include #endif +#if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf -#endif +#endif /* POLARSSL_SELF_TEST */ +#endif /* POLARSSL_PLATFORM_C */ /* Implementation that should never be optimized out by the compiler */ static void polarssl_zeroize( void *v, size_t n ) { @@ -376,8 +381,6 @@ int hmac_drbg_update_seed_file( hmac_drbg_context *ctx, const char *path ) #if defined(POLARSSL_SELF_TEST) -#include - #if !defined(POLARSSL_SHA1_C) /* Dummy checkup routine */ int hmac_drbg_self_test( int verbose ) diff --git a/library/md.c b/library/md.c index b83e6ecd2..9df21b51a 100644 --- a/library/md.c +++ b/library/md.c @@ -36,6 +36,7 @@ #include "polarssl/md_wrap.h" #include +#include #if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \ !defined(EFI32) diff --git a/library/md2.c b/library/md2.c index 9e9a3a210..180a25b2e 100644 --- a/library/md2.c +++ b/library/md2.c @@ -36,15 +36,18 @@ #include "polarssl/md2.h" -#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST) +#if defined(POLARSSL_FS_IO) #include #endif +#if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf -#endif +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_SELF_TEST */ /* Implementation that should never be optimized out by the compiler */ static void polarssl_zeroize( void *v, size_t n ) { diff --git a/library/md4.c b/library/md4.c index 47f5c9c9e..d14390bbf 100644 --- a/library/md4.c +++ b/library/md4.c @@ -36,15 +36,20 @@ #include "polarssl/md4.h" -#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST) +#include + +#if defined(POLARSSL_FS_IO) #include #endif +#if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf -#endif +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_SELF_TEST */ /* Implementation that should never be optimized out by the compiler */ static void polarssl_zeroize( void *v, size_t n ) { diff --git a/library/md5.c b/library/md5.c index 50f4ee3aa..9c5d73aae 100644 --- a/library/md5.c +++ b/library/md5.c @@ -35,15 +35,20 @@ #include "polarssl/md5.h" -#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST) +#include + +#if defined(POLARSSL_FS_IO) #include #endif +#if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf -#endif +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_SELF_TEST */ /* Implementation that should never be optimized out by the compiler */ static void polarssl_zeroize( void *v, size_t n ) { diff --git a/library/md_wrap.c b/library/md_wrap.c index 62110ce76..955437360 100644 --- a/library/md_wrap.c +++ b/library/md_wrap.c @@ -65,12 +65,11 @@ #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_malloc malloc #define polarssl_free free #endif -#include - /* Implementation that should never be optimized out by the compiler */ static void polarssl_zeroize( void *v, size_t n ) { volatile unsigned char *p = v; while( n-- ) *p++ = 0; diff --git a/library/memory_buffer_alloc.c b/library/memory_buffer_alloc.c index 6cde16a9f..b7d583b00 100644 --- a/library/memory_buffer_alloc.c +++ b/library/memory_buffer_alloc.c @@ -33,8 +33,13 @@ #include #if defined(POLARSSL_MEMORY_DEBUG) +#if defined(POLARSSL_PLATFORM_C) +#include "polarssl/platform.h" +#else #include -#endif +#define polarssl_fprintf fprintf +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_MEMORY_DEBUG */ #if defined(POLARSSL_MEMORY_BACKTRACE) #include #endif @@ -43,12 +48,6 @@ #include "polarssl/threading.h" #endif -#if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" -#else -#define polarssl_fprintf fprintf -#endif - /* Implementation that should never be optimized out by the compiler */ static void polarssl_zeroize( void *v, size_t n ) { volatile unsigned char *p = v; while( n-- ) *p++ = 0; diff --git a/library/net.c b/library/net.c index fefeaabc6..a8591ed0d 100644 --- a/library/net.c +++ b/library/net.c @@ -30,6 +30,8 @@ #include "polarssl/net.h" +#include + #if (defined(_WIN32) || defined(_WIN32_WCE)) && !defined(EFIX64) && \ !defined(EFI32) diff --git a/library/oid.c b/library/oid.c index e42f20d93..3cca1fa47 100644 --- a/library/oid.c +++ b/library/oid.c @@ -33,12 +33,13 @@ #include "polarssl/oid.h" #include "polarssl/rsa.h" +#include +#include + #if defined(POLARSSL_X509_USE_C) || defined(POLARSSL_X509_CREATE_C) #include "polarssl/x509.h" #endif -#include - /* * Macro to automatically add the size of #define'd OIDs */ diff --git a/library/pem.c b/library/pem.c index aeaa4b68e..c6d077c64 100644 --- a/library/pem.c +++ b/library/pem.c @@ -34,15 +34,16 @@ #include "polarssl/md5.h" #include "polarssl/cipher.h" +#include + #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_malloc malloc #define polarssl_free free #endif -#include - /* Implementation that should never be optimized out by the compiler */ static void polarssl_zeroize( void *v, size_t n ) { volatile unsigned char *p = v; while( n-- ) *p++ = 0; diff --git a/library/pk.c b/library/pk.c index 572e6c8a2..6736bde51 100644 --- a/library/pk.c +++ b/library/pk.c @@ -27,7 +27,6 @@ #endif #if defined(POLARSSL_PK_C) - #include "polarssl/pk.h" #include "polarssl/pk_wrap.h" diff --git a/library/pk_wrap.c b/library/pk_wrap.c index b6b8218a0..f0f09cbe1 100644 --- a/library/pk_wrap.c +++ b/library/pk_wrap.c @@ -27,12 +27,13 @@ #endif #if defined(POLARSSL_PK_C) - #include "polarssl/pk_wrap.h" /* Even if RSA not activated, for the sake of RSA-alt */ #include "polarssl/rsa.h" +#include + #if defined(POLARSSL_ECP_C) #include "polarssl/ecp.h" #endif diff --git a/library/pkcs11.c b/library/pkcs11.c index a5ad23c7e..303b7b1ef 100644 --- a/library/pkcs11.c +++ b/library/pkcs11.c @@ -27,6 +27,7 @@ #include "polarssl/pkcs11.h" #if defined(POLARSSL_PKCS11_C) + #include "polarssl/md.h" #include "polarssl/oid.h" #include "polarssl/x509_crt.h" diff --git a/library/pkcs12.c b/library/pkcs12.c index b992dba22..f445955ae 100644 --- a/library/pkcs12.c +++ b/library/pkcs12.c @@ -38,6 +38,8 @@ #include "polarssl/asn1.h" #include "polarssl/cipher.h" +#include + #if defined(POLARSSL_ARC4_C) #include "polarssl/arc4.h" #endif diff --git a/library/pkcs5.c b/library/pkcs5.c index ca740460b..b9b51e53c 100644 --- a/library/pkcs5.c +++ b/library/pkcs5.c @@ -43,9 +43,12 @@ #include "polarssl/cipher.h" #include "polarssl/oid.h" +#include + #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf #endif @@ -295,8 +298,6 @@ int pkcs5_self_test( int verbose ) } #else -#include - #define MAX_TESTS 6 size_t plen[MAX_TESTS] = diff --git a/library/pkparse.c b/library/pkparse.c index bc4fc6e27..9a55d6df3 100644 --- a/library/pkparse.c +++ b/library/pkparse.c @@ -32,6 +32,8 @@ #include "polarssl/asn1.h" #include "polarssl/oid.h" +#include + #if defined(POLARSSL_RSA_C) #include "polarssl/rsa.h" #endif diff --git a/library/pkwrite.c b/library/pkwrite.c index f761ea04c..29e172d67 100644 --- a/library/pkwrite.c +++ b/library/pkwrite.c @@ -32,6 +32,8 @@ #include "polarssl/asn1write.h" #include "polarssl/oid.h" +#include + #if defined(POLARSSL_RSA_C) #include "polarssl/rsa.h" #endif diff --git a/library/ripemd160.c b/library/ripemd160.c index 768e2659e..2c81138dc 100644 --- a/library/ripemd160.c +++ b/library/ripemd160.c @@ -36,19 +36,20 @@ #include "polarssl/ripemd160.h" -#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST) +#include + +#if defined(POLARSSL_FS_IO) #include #endif #if defined(POLARSSL_SELF_TEST) -#include -#endif - #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf -#endif +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_SELF_TEST */ /* * 32-bit integer manipulation macros (little endian) diff --git a/library/rsa.c b/library/rsa.c index f09231e28..5f86173d7 100644 --- a/library/rsa.c +++ b/library/rsa.c @@ -37,16 +37,20 @@ #include "polarssl/rsa.h" #include "polarssl/oid.h" +#include + #if defined(POLARSSL_PKCS1_V21) #include "polarssl/md.h" #endif +#if defined(POLARSSL_PKCS1_V15) && !defined(__OpenBSD__) #include -#include +#endif #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf #endif diff --git a/library/sha1.c b/library/sha1.c index 455c7808a..c477e9a61 100644 --- a/library/sha1.c +++ b/library/sha1.c @@ -35,15 +35,20 @@ #include "polarssl/sha1.h" -#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST) +#include + +#if defined(POLARSSL_FS_IO) #include #endif +#if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf -#endif +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_SELF_TEST */ /* Implementation that should never be optimized out by the compiler */ static void polarssl_zeroize( void *v, size_t n ) { diff --git a/library/sha256.c b/library/sha256.c index 102402e18..dedc6b84f 100644 --- a/library/sha256.c +++ b/library/sha256.c @@ -35,15 +35,20 @@ #include "polarssl/sha256.h" -#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST) +#include + +#if defined(POLARSSL_FS_IO) #include #endif +#if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf -#endif +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_SELF_TEST */ /* Implementation that should never be optimized out by the compiler */ static void polarssl_zeroize( void *v, size_t n ) { diff --git a/library/sha512.c b/library/sha512.c index b9dac62db..ed044ed80 100644 --- a/library/sha512.c +++ b/library/sha512.c @@ -35,15 +35,20 @@ #include "polarssl/sha512.h" -#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST) +#include + +#if defined(POLARSSL_FS_IO) #include #endif +#if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf -#endif +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_SELF_TEST */ /* Implementation that should never be optimized out by the compiler */ static void polarssl_zeroize( void *v, size_t n ) { diff --git a/library/ssl_cache.c b/library/ssl_cache.c index c649129b8..30da95a5b 100644 --- a/library/ssl_cache.c +++ b/library/ssl_cache.c @@ -34,15 +34,16 @@ #include "polarssl/ssl_cache.h" +#include + #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_malloc malloc #define polarssl_free free #endif -#include - void ssl_cache_init( ssl_cache_context *cache ) { memset( cache, 0, sizeof( ssl_cache_context ) ); diff --git a/library/ssl_ciphersuites.c b/library/ssl_ciphersuites.c index 014cfc90b..43e5e7b5f 100644 --- a/library/ssl_ciphersuites.c +++ b/library/ssl_ciphersuites.c @@ -33,7 +33,8 @@ #include "polarssl/ssl_ciphersuites.h" #include "polarssl/ssl.h" -#include +// #include +#include #if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \ !defined(EFI32) diff --git a/library/ssl_cli.c b/library/ssl_cli.c index 62ff3cfc5..c84f8d272 100644 --- a/library/ssl_cli.c +++ b/library/ssl_cli.c @@ -31,16 +31,16 @@ #include "polarssl/debug.h" #include "polarssl/ssl.h" +#include + #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_malloc malloc #define polarssl_free free #endif -#include -#include - #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) #include typedef UINT32 uint32_t; diff --git a/library/ssl_srv.c b/library/ssl_srv.c index 8cb140e63..755bba9f1 100644 --- a/library/ssl_srv.c +++ b/library/ssl_srv.c @@ -30,6 +30,9 @@ #include "polarssl/debug.h" #include "polarssl/ssl.h" + +#include + #if defined(POLARSSL_ECP_C) #include "polarssl/ecp.h" #endif @@ -37,13 +40,11 @@ #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_malloc malloc #define polarssl_free free #endif -#include -#include - #if defined(POLARSSL_HAVE_TIME) #include #endif diff --git a/library/ssl_tls.c b/library/ssl_tls.c index 4b5418706..961f4dcf0 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -39,6 +39,8 @@ #include "polarssl/debug.h" #include "polarssl/ssl.h" +#include + #if defined(POLARSSL_X509_CRT_PARSE_C) && \ defined(POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE) #include "polarssl/oid.h" @@ -47,12 +49,11 @@ #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_malloc malloc #define polarssl_free free #endif -#include - #if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \ !defined(EFI32) #define strcasecmp _stricmp diff --git a/library/x509.c b/library/x509.c index a3cb66943..c9b196f46 100644 --- a/library/x509.c +++ b/library/x509.c @@ -41,6 +41,9 @@ #include "polarssl/x509.h" #include "polarssl/asn1.h" #include "polarssl/oid.h" + +#include + #if defined(POLARSSL_PEM_PARSE_C) #include "polarssl/pem.h" #endif @@ -48,21 +51,19 @@ #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include +#include #define polarssl_printf printf #define polarssl_malloc malloc #define polarssl_free free #endif -#include -#include #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) #include #else #include #endif -#include - #if defined(POLARSSL_FS_IO) #if !defined(_WIN32) #include diff --git a/library/x509_create.c b/library/x509_create.c index ab87ac71f..0a75c388b 100644 --- a/library/x509_create.c +++ b/library/x509_create.c @@ -32,6 +32,8 @@ #include "polarssl/asn1write.h" #include "polarssl/oid.h" +#include + #if defined(_MSC_VER) && !defined strncasecmp && !defined(EFIX64) && \ !defined(EFI32) #define strncasecmp _strnicmp diff --git a/library/x509_crl.c b/library/x509_crl.c index 2c90582a1..b957e3765 100644 --- a/library/x509_crl.c +++ b/library/x509_crl.c @@ -40,6 +40,9 @@ #include "polarssl/x509_crl.h" #include "polarssl/oid.h" + +#include + #if defined(POLARSSL_PEM_PARSE_C) #include "polarssl/pem.h" #endif @@ -47,14 +50,12 @@ #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_malloc malloc #define polarssl_free free #endif -#include -#include #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) - #include #else #include diff --git a/library/x509_crt.c b/library/x509_crt.c index d1d7d7396..ea3b44228 100644 --- a/library/x509_crt.c +++ b/library/x509_crt.c @@ -40,6 +40,10 @@ #include "polarssl/x509_crt.h" #include "polarssl/oid.h" + +#include +#include + #if defined(POLARSSL_PEM_PARSE_C) #include "polarssl/pem.h" #endif @@ -47,6 +51,7 @@ #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_malloc malloc #define polarssl_free free #endif @@ -55,22 +60,19 @@ #include "polarssl/threading.h" #endif -#include -#include #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) #include #else #include #endif -#include - #if defined(POLARSSL_FS_IO) +#include #if !defined(_WIN32) || defined(EFIX64) || defined(EFI32) #include #include #include -#endif +#endif /* !_WIN32 || EFIX64 || EFI32 */ #endif /* Implementation that should never be optimized out by the compiler */ diff --git a/library/x509_csr.c b/library/x509_csr.c index a6fe58176..a4b8ad754 100644 --- a/library/x509_csr.c +++ b/library/x509_csr.c @@ -40,6 +40,9 @@ #include "polarssl/x509_csr.h" #include "polarssl/oid.h" + +#include + #if defined(POLARSSL_PEM_PARSE_C) #include "polarssl/pem.h" #endif @@ -47,13 +50,11 @@ #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_malloc malloc #define polarssl_free free #endif -#include -#include - #if defined(POLARSSL_FS_IO) || defined(EFIX64) || defined(EFI32) #include #endif diff --git a/library/x509write_crt.c b/library/x509write_crt.c index 3e850ceca..5bf44a068 100644 --- a/library/x509write_crt.c +++ b/library/x509write_crt.c @@ -39,6 +39,8 @@ #include "polarssl/asn1write.h" #include "polarssl/sha1.h" +#include + #if defined(POLARSSL_PEM_WRITE_C) #include "polarssl/pem.h" #endif /* POLARSSL_PEM_WRITE_C */ diff --git a/library/x509write_csr.c b/library/x509write_csr.c index 8f297a011..5e2a5e192 100644 --- a/library/x509write_csr.c +++ b/library/x509write_csr.c @@ -37,13 +37,13 @@ #include "polarssl/oid.h" #include "polarssl/asn1write.h" +#include +#include + #if defined(POLARSSL_PEM_WRITE_C) #include "polarssl/pem.h" #endif -#include -#include - /* Implementation that should never be optimized out by the compiler */ static void polarssl_zeroize( void *v, size_t n ) { volatile unsigned char *p = v; while( n-- ) *p++ = 0; diff --git a/library/xtea.c b/library/xtea.c index cea9ff82f..e543d654c 100644 --- a/library/xtea.c +++ b/library/xtea.c @@ -30,11 +30,16 @@ #include "polarssl/xtea.h" +#include + +#if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include #define polarssl_printf printf -#endif +#endif /* POLARSSL_PLATFORM_C */ +#endif /* POLARSSL_SELF_TEST */ #if !defined(POLARSSL_XTEA_ALT) @@ -190,9 +195,6 @@ int xtea_crypt_cbc( xtea_context *ctx, int mode, size_t length, #if defined(POLARSSL_SELF_TEST) -#include -#include - /* * XTEA tests vectors (non-official) */ diff --git a/tests/scripts/generate_code.pl b/tests/scripts/generate_code.pl index 45913781d..ba7473816 100755 --- a/tests/scripts/generate_code.pl +++ b/tests/scripts/generate_code.pl @@ -65,12 +65,12 @@ print TEST_FILE << "END"; #include POLARSSL_CONFIG_FILE #endif +$test_helpers + $suite_pre_code $suite_header $suite_post_code -$test_helpers - END $test_main =~ s/SUITE_PRE_DEP/$suite_pre_code/; diff --git a/tests/suites/helpers.function b/tests/suites/helpers.function index 73d6767f9..4e1bac1ee 100644 --- a/tests/suites/helpers.function +++ b/tests/suites/helpers.function @@ -1,6 +1,9 @@ #if defined(POLARSSL_PLATFORM_C) #include "polarssl/platform.h" #else +#include +#define polarssl_printf printf +#define polarssl_fprintf fprintf #define polarssl_malloc malloc #define polarssl_free free #endif diff --git a/tests/suites/main_test.function b/tests/suites/main_test.function index 4a5e1041d..9d9ebe5f8 100644 --- a/tests/suites/main_test.function +++ b/tests/suites/main_test.function @@ -1,15 +1,3 @@ -#include -#include - -#if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" -#else -#define polarssl_printf printf -#define polarssl_fprintf fprintf -#define polarssl_malloc malloc -#define polarssl_free free -#endif - #if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C) #include "polarssl/memory_buffer_alloc.h" #endif diff --git a/tests/suites/test_suite_ctr_drbg.function b/tests/suites/test_suite_ctr_drbg.function index a36bab245..c9cb22ea1 100644 --- a/tests/suites/test_suite_ctr_drbg.function +++ b/tests/suites/test_suite_ctr_drbg.function @@ -1,6 +1,8 @@ /* BEGIN_HEADER */ #include +#include + int test_offset_idx; int entropy_func( void *data, unsigned char *buf, size_t len ) { diff --git a/tests/suites/test_suite_hmac_drbg.function b/tests/suites/test_suite_hmac_drbg.function index bd4511267..d58c426cf 100644 --- a/tests/suites/test_suite_hmac_drbg.function +++ b/tests/suites/test_suite_hmac_drbg.function @@ -1,6 +1,8 @@ /* BEGIN_HEADER */ #include +#include + typedef struct { unsigned char *p;