Include common.h instead of config.h in library source files

In library source files, include "common.h", which takes care of including "mbedtls/config.h" (or the alternative MBEDTLS_CONFIG_FILE) and other things that are used throughout the library. FROM=$'#if !defined(MBEDTLS_CONFIG_FILE)\n#include "mbedtls/config.h"\n#else\n#include MBEDTLS_CONFIG_FILE\n#endif' perl -i -0777 -pe 's~\Q$ENV{FROM}~#include "common.h"~' library/*.c 3rdparty/*/library/*.c scripts/data_files/error.fmt scripts/data_files/version_features.fmt Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2020-06-03 01:43:33 +02:00 · 2020-06-03 01:43:33 +02:00 · db09ef6d22
commit db09ef6d22
parent 66c3dc44f2
86 changed files with 86 additions and 430 deletions
--- a/3rdparty/everest/library/Hacl_Curve25519_joined.c
+++ b/3rdparty/everest/library/Hacl_Curve25519_joined.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED)

--- a/3rdparty/everest/library/everest.c
+++ b/3rdparty/everest/library/everest.c
@ -19,11 +19,7 @@
 *  This file is part of Mbed TLS (https://tls.mbed.org).
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #include <string.h>

--- a/3rdparty/everest/library/x25519.c
+++ b/3rdparty/everest/library/x25519.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_ECDH_C) && defined(MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED)

--- a/library/aes.c
+++ b/library/aes.c
@ -25,11 +25,7 @@
 *  http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_AES_C)

--- a/library/aesni.c
+++ b/library/aesni.c
@ -24,11 +24,7 @@
 * [CLMUL-WP] http://software.intel.com/en-us/articles/intel-carry-less-multiplication-instruction-and-its-usage-for-computing-the-gcm-mode/
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_AESNI_C)

--- a/library/arc4.c
+++ b/library/arc4.c
@ -24,11 +24,7 @@
 *  http://groups.google.com/group/sci.crypt/msg/10a300c9d21afca0
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_ARC4_C)

--- a/library/aria.c
+++ b/library/aria.c
@ -25,11 +25,7 @@
 * [2] https://tools.ietf.org/html/rfc5794
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_ARIA_C)

--- a/library/asn1parse.c
+++ b/library/asn1parse.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_ASN1_PARSE_C)

--- a/library/asn1write.c
+++ b/library/asn1write.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_ASN1_WRITE_C)

--- a/library/base64.c
+++ b/library/base64.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_BASE64_C)

--- a/library/bignum.c
+++ b/library/bignum.c
@ -35,11 +35,7 @@
 *
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_BIGNUM_C)

--- a/library/blowfish.c
+++ b/library/blowfish.c
@ -25,11 +25,7 @@
 *
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_BLOWFISH_C)

--- a/library/camellia.c
+++ b/library/camellia.c
@ -25,11 +25,7 @@
 *  http://info.isl.ntt.co.jp/crypt/eng/camellia/dl/01espec.pdf
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_CAMELLIA_C)

--- a/library/ccm.c
+++ b/library/ccm.c
@ -28,11 +28,7 @@
 * RFC 5116 "An Interface and Algorithms for Authenticated Encryption"
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_CCM_C)

--- a/library/certs.c
+++ b/library/certs.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #include "mbedtls/certs.h"

--- a/library/chacha20.c
+++ b/library/chacha20.c
@ -23,11 +23,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_CHACHA20_C)

--- a/library/chachapoly.c
+++ b/library/chachapoly.c
@ -20,11 +20,7 @@
 *
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_CHACHAPOLY_C)

--- a/library/cipher.c
+++ b/library/cipher.c
@ -23,11 +23,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_CIPHER_C)

--- a/library/cipher_wrap.c
+++ b/library/cipher_wrap.c
@ -23,11 +23,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_CIPHER_C)

--- a/library/cmac.c
+++ b/library/cmac.c
@ -40,11 +40,7 @@
 *
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_CMAC_C)

--- a/library/ctr_drbg.c
+++ b/library/ctr_drbg.c
@ -24,11 +24,7 @@
 *  http://csrc.nist.gov/publications/nistpubs/800-90/SP800-90revised_March2007.pdf
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_CTR_DRBG_C)

--- a/library/debug.c
+++ b/library/debug.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_DEBUG_C)

--- a/library/des.c
+++ b/library/des.c
@ -25,11 +25,7 @@
 *  http://csrc.nist.gov/publications/fips/fips46-3/fips46-3.pdf
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_DES_C)

--- a/library/dhm.c
+++ b/library/dhm.c
@ -27,11 +27,7 @@
 *
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_DHM_C)

--- a/library/ecdh.c
+++ b/library/ecdh.c
@ -26,11 +26,7 @@
 * RFC 4492
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_ECDH_C)

--- a/library/ecdsa.c
+++ b/library/ecdsa.c
@ -25,11 +25,7 @@
 * SEC1 http://www.secg.org/index.php?action=secg,docs_secg
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_ECDSA_C)

--- a/library/ecjpake.c
+++ b/library/ecjpake.c
@ -24,11 +24,7 @@
 * available to members of the Thread Group http://threadgroup.org/
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_ECJPAKE_C)

--- a/library/ecp.c
+++ b/library/ecp.c
@ -41,11 +41,7 @@
 *     <http://eprint.iacr.org/2004/342.pdf>
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 /**
 * \brief Function level alternative implementation.
--- a/library/ecp_curves.c
+++ b/library/ecp_curves.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_ECP_C)

--- a/library/entropy.c
+++ b/library/entropy.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_ENTROPY_C)

--- a/library/entropy_poll.c
+++ b/library/entropy_poll.c
@ -24,11 +24,7 @@
 #define _GNU_SOURCE
 #endif

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #include <string.h>

--- a/library/error.c
+++ b/library/error.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_ERROR_STRERROR_DUMMY)
 #include <string.h>
--- a/library/gcm.c
+++ b/library/gcm.c
@ -29,11 +29,7 @@
 * [MGV] 4.1, pp. 12-13, to enhance speed without using too much memory.
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_GCM_C)

--- a/library/havege.c
+++ b/library/havege.c
@ -26,11 +26,7 @@
 *  Contact: seznec(at)irisa_dot_fr - orocheco(at)irisa_dot_fr
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_HAVEGE_C)

--- a/library/hkdf.c
+++ b/library/hkdf.c
@ -18,11 +18,7 @@
 *
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_HKDF_C)

--- a/library/hmac_drbg.c
+++ b/library/hmac_drbg.c
@ -25,11 +25,7 @@
 *  References below are based on rev. 1 (January 2012).
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_HMAC_DRBG_C)

--- a/library/md.c
+++ b/library/md.c
@ -23,11 +23,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_MD_C)

--- a/library/md2.c
+++ b/library/md2.c
@ -25,11 +25,7 @@
 *  http://www.ietf.org/rfc/rfc1319.txt
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_MD2_C)

--- a/library/md4.c
+++ b/library/md4.c
@ -25,11 +25,7 @@
 *  http://www.ietf.org/rfc/rfc1320.txt
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_MD4_C)

--- a/library/md5.c
+++ b/library/md5.c
@ -24,11 +24,7 @@
 *  http://www.ietf.org/rfc/rfc1321.txt
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_MD5_C)

--- a/library/memory_buffer_alloc.c
+++ b/library/memory_buffer_alloc.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
 #include "mbedtls/memory_buffer_alloc.h"
--- a/library/net_sockets.c
+++ b/library/net_sockets.c
@ -25,11 +25,7 @@
 #define _POSIX_C_SOURCE 200112L
 #define _XOPEN_SOURCE 600 /* sockaddr_storage */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_NET_C)

--- a/library/nist_kw.c
+++ b/library/nist_kw.c
@ -29,11 +29,7 @@
 * the wrapping and unwrapping operation than the definition in NIST SP 800-38F.
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_NIST_KW_C)

--- a/library/oid.c
+++ b/library/oid.c
@ -21,11 +21,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_OID_C)

--- a/library/padlock.c
+++ b/library/padlock.c
@ -25,11 +25,7 @@
 *  programming_guide.pdf
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_PADLOCK_C)

--- a/library/pem.c
+++ b/library/pem.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_PEM_PARSE_C) || defined(MBEDTLS_PEM_WRITE_C)

--- a/library/pk.c
+++ b/library/pk.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_PK_C)
 #include "mbedtls/pk.h"
--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_PK_C)
 #include "mbedtls/pk_internal.h"
--- a/library/pkcs12.c
+++ b/library/pkcs12.c
@ -25,11 +25,7 @@
 *  ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-12/pkcs-12v1-1.asn
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_PKCS12_C)

--- a/library/pkcs5.c
+++ b/library/pkcs5.c
@ -29,11 +29,7 @@
 * http://tools.ietf.org/html/rfc6070 (Test vectors)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_PKCS5_C)

--- a/library/pkparse.c
+++ b/library/pkparse.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_PK_PARSE_C)

--- a/library/pkwrite.c
+++ b/library/pkwrite.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_PK_WRITE_C)

--- a/library/platform.c
+++ b/library/platform.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_PLATFORM_C)

--- a/library/platform_util.c
+++ b/library/platform_util.c
@ -28,11 +28,7 @@
 #define _POSIX_C_SOURCE 200112L
 #endif

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #include "mbedtls/platform_util.h"
 #include "mbedtls/platform.h"
--- a/library/poly1305.c
+++ b/library/poly1305.c
@ -20,11 +20,7 @@
 *
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_POLY1305_C)

--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@ -20,11 +20,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_PSA_CRYPTO_C)

--- a/library/psa_crypto_se.c
+++ b/library/psa_crypto_se.c
@ -20,11 +20,7 @@
 *  This file is part of Mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_PSA_CRYPTO_SE_C)

--- a/library/psa_crypto_slot_management.c
+++ b/library/psa_crypto_slot_management.c
@ -20,11 +20,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_PSA_CRYPTO_C)

--- a/library/ripemd160.c
+++ b/library/ripemd160.c
@ -25,11 +25,7 @@
 *  http://ehash.iaik.tugraz.at/wiki/RIPEMD-160
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_RIPEMD160_C)

--- a/library/rsa.c
+++ b/library/rsa.c
@ -37,11 +37,7 @@
 *
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_RSA_C)

--- a/library/rsa_internal.c
+++ b/library/rsa_internal.c
@ -20,11 +20,7 @@
 *
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_RSA_C)

--- a/library/sha1.c
+++ b/library/sha1.c
@ -24,11 +24,7 @@
 *  http://www.itl.nist.gov/fipspubs/fip180-1.htm
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_SHA1_C)

--- a/library/sha256.c
+++ b/library/sha256.c
@ -24,11 +24,7 @@
 *  http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_SHA256_C)

--- a/library/sha512.c
+++ b/library/sha512.c
@ -24,11 +24,7 @@
 *  http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_SHA512_C)

--- a/library/ssl_cache.c
+++ b/library/ssl_cache.c
@ -23,11 +23,7 @@
 * to store and retrieve the session information.
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_SSL_CACHE_C)

--- a/library/ssl_ciphersuites.c
+++ b/library/ssl_ciphersuites.c
@ -21,11 +21,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_SSL_TLS_C)

--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_SSL_CLI_C)

--- a/library/ssl_cookie.c
+++ b/library/ssl_cookie.c
@ -23,11 +23,7 @@
 * to store and retrieve the session information.
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_SSL_COOKIE_C)

--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@ -28,11 +28,7 @@
 *  http://www.ietf.org/rfc/rfc4346.txt
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_SSL_TLS_C)

--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_SSL_SRV_C)

--- a/library/ssl_ticket.c
+++ b/library/ssl_ticket.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_SSL_TICKET_C)

--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@ -27,11 +27,7 @@
 *  http://www.ietf.org/rfc/rfc4346.txt
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_SSL_TLS_C)

--- a/library/threading.c
+++ b/library/threading.c
@ -27,11 +27,7 @@
 #define _POSIX_C_SOURCE 200112L
 #endif

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_THREADING_C)

--- a/library/timing.c
+++ b/library/timing.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_PLATFORM_C)
 #include "mbedtls/platform.h"
--- a/library/version.c
+++ b/library/version.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_VERSION_C)

--- a/library/version_features.c
+++ b/library/version_features.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_VERSION_C)

--- a/library/x509.c
+++ b/library/x509.c
@ -29,11 +29,7 @@
 *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_X509_USE_C)

--- a/library/x509_create.c
+++ b/library/x509_create.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_X509_CREATE_C)

--- a/library/x509_crl.c
+++ b/library/x509_crl.c
@ -29,11 +29,7 @@
 *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_X509_CRL_PARSE_C)

--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@ -31,11 +31,7 @@
 *  [SIRO] https://cabforum.org/wp-content/uploads/Chunghwatelecom201503cabforumV4.pdf
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_X509_CRT_PARSE_C)

--- a/library/x509_csr.c
+++ b/library/x509_csr.c
@ -29,11 +29,7 @@
 *  http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_X509_CSR_PARSE_C)

--- a/library/x509write_crt.c
+++ b/library/x509write_crt.c
@ -25,11 +25,7 @@
 * - attributes: PKCS#9 v2.0 aka RFC 2985
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_X509_CRT_WRITE_C)

--- a/library/x509write_csr.c
+++ b/library/x509write_csr.c
@ -24,11 +24,7 @@
 * - attributes: PKCS#9 v2.0 aka RFC 2985
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_X509_CSR_WRITE_C)

--- a/library/xtea.c
+++ b/library/xtea.c
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_XTEA_C)

--- a/scripts/data_files/error.fmt
+++ b/scripts/data_files/error.fmt
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_ERROR_STRERROR_DUMMY)
 #include <string.h>
--- a/scripts/data_files/version_features.fmt
+++ b/scripts/data_files/version_features.fmt
@ -19,11 +19,7 @@
 *  This file is part of mbed TLS (https://tls.mbed.org)
 */

-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
+#include "common.h"

 #if defined(MBEDTLS_VERSION_C)