From c49fbbf3eb2d7caa9c9f8edb44f857435d37347f Mon Sep 17 00:00:00 2001 From: Jaeden Amero Date: Thu, 4 Jul 2019 20:01:14 +0100 Subject: [PATCH] Use mbedtls-based path for includes To help the build system find the correct include files, paths starting with "mbedtls/" or "psa/" must be used. Otherwise, you can run into build failures like the following when building Mbed Crypto as a submodule. In file included from chachapoly.c:31:0: ../../include/mbedtls/chachapoly.h:43:10: fatal error: poly1305.h: No such file or directory #include "poly1305.h" ^~~~~~~~~~~~ compilation terminated. Includes for ALT implementations are not modified, as the alt headers are provided by system integrators and not Mbed TLS or Mbed Crypto. --- configs/config-no-entropy.h | 2 +- configs/config-psa-crypto.h | 2 +- include/mbedtls/aes.h | 2 +- include/mbedtls/aesni.h | 4 ++-- include/mbedtls/arc4.h | 2 +- include/mbedtls/aria.h | 4 ++-- include/mbedtls/asn1.h | 4 ++-- include/mbedtls/asn1write.h | 4 ++-- include/mbedtls/base64.h | 2 +- include/mbedtls/bignum.h | 2 +- include/mbedtls/blowfish.h | 4 ++-- include/mbedtls/bn_mul.h | 4 ++-- include/mbedtls/camellia.h | 4 ++-- include/mbedtls/ccm.h | 4 ++-- include/mbedtls/certs.h | 2 +- include/mbedtls/chacha20.h | 2 +- include/mbedtls/chachapoly.h | 6 +++--- include/mbedtls/cipher.h | 4 ++-- include/mbedtls/cipher_internal.h | 4 ++-- include/mbedtls/cmac.h | 4 ++-- include/mbedtls/compat-1.3.h | 2 +- include/mbedtls/config.h | 2 +- include/mbedtls/ctr_drbg.h | 6 +++--- include/mbedtls/des.h | 2 +- include/mbedtls/dhm.h | 4 ++-- include/mbedtls/ecdh.h | 4 ++-- include/mbedtls/ecdsa.h | 6 +++--- include/mbedtls/ecjpake.h | 6 +++--- include/mbedtls/ecp.h | 4 ++-- include/mbedtls/ecp_internal.h | 2 +- include/mbedtls/entropy.h | 10 +++++----- include/mbedtls/entropy_poll.h | 2 +- include/mbedtls/error.h | 2 +- include/mbedtls/gcm.h | 4 ++-- include/mbedtls/havege.h | 2 +- include/mbedtls/hkdf.h | 4 ++-- include/mbedtls/hmac_drbg.h | 6 +++--- include/mbedtls/md.h | 2 +- include/mbedtls/md2.h | 2 +- include/mbedtls/md4.h | 2 +- include/mbedtls/md5.h | 2 +- include/mbedtls/md_internal.h | 4 ++-- include/mbedtls/memory_buffer_alloc.h | 2 +- include/mbedtls/nist_kw.h | 4 ++-- include/mbedtls/oid.h | 10 +++++----- include/mbedtls/padlock.h | 4 ++-- include/mbedtls/pem.h | 2 +- include/mbedtls/pk.h | 10 +++++----- include/mbedtls/pk_internal.h | 4 ++-- include/mbedtls/pkcs12.h | 8 ++++---- include/mbedtls/pkcs5.h | 6 +++--- include/mbedtls/platform.h | 4 ++-- include/mbedtls/platform_time.h | 2 +- include/mbedtls/platform_util.h | 4 ++-- include/mbedtls/poly1305.h | 2 +- include/mbedtls/psa_util.h | 10 +++++----- include/mbedtls/ripemd160.h | 2 +- include/mbedtls/rsa.h | 8 ++++---- include/mbedtls/rsa_internal.h | 4 ++-- include/mbedtls/sha1.h | 2 +- include/mbedtls/sha256.h | 2 +- include/mbedtls/sha512.h | 2 +- include/mbedtls/threading.h | 2 +- include/mbedtls/timing.h | 2 +- include/mbedtls/version.h | 2 +- include/mbedtls/xtea.h | 2 +- 66 files changed, 123 insertions(+), 123 deletions(-) diff --git a/configs/config-no-entropy.h b/configs/config-no-entropy.h index 6f44899e4..502ca0320 100644 --- a/configs/config-no-entropy.h +++ b/configs/config-no-entropy.h @@ -81,6 +81,6 @@ /* Miscellaneous options */ #define MBEDTLS_AES_ROM_TABLES -#include "check_config.h" +#include "mbedtls/check_config.h" #endif /* MBEDTLS_CONFIG_H */ diff --git a/configs/config-psa-crypto.h b/configs/config-psa-crypto.h index 97a1b2b68..58a2c88cf 100644 --- a/configs/config-psa-crypto.h +++ b/configs/config-psa-crypto.h @@ -1971,6 +1971,6 @@ #include MBEDTLS_USER_CONFIG_FILE #endif -#include "check_config.h" +#include "mbedtls/check_config.h" #endif /* MBEDTLS_CONFIG_H */ diff --git a/include/mbedtls/aes.h b/include/mbedtls/aes.h index 94e7282d3..63c0f672b 100644 --- a/include/mbedtls/aes.h +++ b/include/mbedtls/aes.h @@ -42,7 +42,7 @@ #define MBEDTLS_AES_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/aesni.h b/include/mbedtls/aesni.h index a4ca012f8..955b7c990 100644 --- a/include/mbedtls/aesni.h +++ b/include/mbedtls/aesni.h @@ -28,12 +28,12 @@ #define MBEDTLS_AESNI_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "aes.h" +#include "mbedtls/aes.h" #define MBEDTLS_AESNI_AES 0x02000000u #define MBEDTLS_AESNI_CLMUL 0x00000002u diff --git a/include/mbedtls/arc4.h b/include/mbedtls/arc4.h index fb044d5b7..acad623ad 100644 --- a/include/mbedtls/arc4.h +++ b/include/mbedtls/arc4.h @@ -29,7 +29,7 @@ #define MBEDTLS_ARC4_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/aria.h b/include/mbedtls/aria.h index 1e8956ed1..a72a8c22a 100644 --- a/include/mbedtls/aria.h +++ b/include/mbedtls/aria.h @@ -31,7 +31,7 @@ #define MBEDTLS_ARIA_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif @@ -39,7 +39,7 @@ #include #include -#include "platform_util.h" +#include "mbedtls/platform_util.h" #define MBEDTLS_ARIA_ENCRYPT 1 /**< ARIA encryption. */ #define MBEDTLS_ARIA_DECRYPT 0 /**< ARIA decryption. */ diff --git a/include/mbedtls/asn1.h b/include/mbedtls/asn1.h index f80acd7e1..ab947ab7e 100644 --- a/include/mbedtls/asn1.h +++ b/include/mbedtls/asn1.h @@ -25,7 +25,7 @@ #define MBEDTLS_ASN1_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif @@ -33,7 +33,7 @@ #include #if defined(MBEDTLS_BIGNUM_C) -#include "bignum.h" +#include "mbedtls/bignum.h" #endif /** diff --git a/include/mbedtls/asn1write.h b/include/mbedtls/asn1write.h index 8aa01b43a..336f2daf1 100644 --- a/include/mbedtls/asn1write.h +++ b/include/mbedtls/asn1write.h @@ -25,12 +25,12 @@ #define MBEDTLS_ASN1_WRITE_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "asn1.h" +#include "mbedtls/asn1.h" #define MBEDTLS_ASN1_CHK_ADD(g, f) \ do \ diff --git a/include/mbedtls/base64.h b/include/mbedtls/base64.h index 0d024164c..07ae3bf54 100644 --- a/include/mbedtls/base64.h +++ b/include/mbedtls/base64.h @@ -25,7 +25,7 @@ #define MBEDTLS_BASE64_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/bignum.h b/include/mbedtls/bignum.h index a04a145a8..0b26727f3 100644 --- a/include/mbedtls/bignum.h +++ b/include/mbedtls/bignum.h @@ -25,7 +25,7 @@ #define MBEDTLS_BIGNUM_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/blowfish.h b/include/mbedtls/blowfish.h index f01573dca..1e5dba3a3 100644 --- a/include/mbedtls/blowfish.h +++ b/include/mbedtls/blowfish.h @@ -25,7 +25,7 @@ #define MBEDTLS_BLOWFISH_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif @@ -33,7 +33,7 @@ #include #include -#include "platform_util.h" +#include "mbedtls/platform_util.h" #define MBEDTLS_BLOWFISH_ENCRYPT 1 #define MBEDTLS_BLOWFISH_DECRYPT 0 diff --git a/include/mbedtls/bn_mul.h b/include/mbedtls/bn_mul.h index c33bd8d4a..db03ba2c0 100644 --- a/include/mbedtls/bn_mul.h +++ b/include/mbedtls/bn_mul.h @@ -39,12 +39,12 @@ #define MBEDTLS_BN_MUL_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "bignum.h" +#include "mbedtls/bignum.h" #if defined(MBEDTLS_HAVE_ASM) diff --git a/include/mbedtls/camellia.h b/include/mbedtls/camellia.h index 3eeb66366..a8324543c 100644 --- a/include/mbedtls/camellia.h +++ b/include/mbedtls/camellia.h @@ -25,7 +25,7 @@ #define MBEDTLS_CAMELLIA_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif @@ -33,7 +33,7 @@ #include #include -#include "platform_util.h" +#include "mbedtls/platform_util.h" #define MBEDTLS_CAMELLIA_ENCRYPT 1 #define MBEDTLS_CAMELLIA_DECRYPT 0 diff --git a/include/mbedtls/ccm.h b/include/mbedtls/ccm.h index f03e3b580..ceac36ca3 100644 --- a/include/mbedtls/ccm.h +++ b/include/mbedtls/ccm.h @@ -50,12 +50,12 @@ #define MBEDTLS_CCM_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "cipher.h" +#include "mbedtls/cipher.h" #define MBEDTLS_ERR_CCM_BAD_INPUT -0x000D /**< Bad input parameters to the function. */ #define MBEDTLS_ERR_CCM_AUTH_FAILED -0x000F /**< Authenticated decryption failed. */ diff --git a/include/mbedtls/certs.h b/include/mbedtls/certs.h index b7c5708f8..c61790208 100644 --- a/include/mbedtls/certs.h +++ b/include/mbedtls/certs.h @@ -25,7 +25,7 @@ #define MBEDTLS_CERTS_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/chacha20.h b/include/mbedtls/chacha20.h index 2ae5e6e5f..243ae63af 100644 --- a/include/mbedtls/chacha20.h +++ b/include/mbedtls/chacha20.h @@ -34,7 +34,7 @@ #define MBEDTLS_CHACHA20_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/chachapoly.h b/include/mbedtls/chachapoly.h index 49e615d27..3d842ef19 100644 --- a/include/mbedtls/chachapoly.h +++ b/include/mbedtls/chachapoly.h @@ -34,13 +34,13 @@ #define MBEDTLS_CHACHAPOLY_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif /* for shared error codes */ -#include "poly1305.h" +#include "mbedtls/poly1305.h" #define MBEDTLS_ERR_CHACHAPOLY_BAD_STATE -0x0054 /**< The requested operation is not permitted in the current state. */ #define MBEDTLS_ERR_CHACHAPOLY_AUTH_FAILED -0x0056 /**< Authenticated decryption failed: data was not authentic. */ @@ -58,7 +58,7 @@ mbedtls_chachapoly_mode_t; #if !defined(MBEDTLS_CHACHAPOLY_ALT) -#include "chacha20.h" +#include "mbedtls/chacha20.h" typedef struct mbedtls_chachapoly_context { diff --git a/include/mbedtls/cipher.h b/include/mbedtls/cipher.h index ea00703c5..96efd937f 100644 --- a/include/mbedtls/cipher.h +++ b/include/mbedtls/cipher.h @@ -30,13 +30,13 @@ #define MBEDTLS_CIPHER_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif #include -#include "platform_util.h" +#include "mbedtls/platform_util.h" #if defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CCM_C) || defined(MBEDTLS_CHACHAPOLY_C) #define MBEDTLS_CIPHER_MODE_AEAD diff --git a/include/mbedtls/cipher_internal.h b/include/mbedtls/cipher_internal.h index d71133900..702b5491c 100644 --- a/include/mbedtls/cipher_internal.h +++ b/include/mbedtls/cipher_internal.h @@ -27,12 +27,12 @@ #define MBEDTLS_CIPHER_WRAP_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "cipher.h" +#include "mbedtls/cipher.h" #if defined(MBEDTLS_USE_PSA_CRYPTO) #include "psa/crypto.h" diff --git a/include/mbedtls/cmac.h b/include/mbedtls/cmac.h index 9d42b3f20..792fbdc33 100644 --- a/include/mbedtls/cmac.h +++ b/include/mbedtls/cmac.h @@ -29,12 +29,12 @@ #define MBEDTLS_CMAC_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "cipher.h" +#include "mbedtls/cipher.h" #ifdef __cplusplus extern "C" { diff --git a/include/mbedtls/compat-1.3.h b/include/mbedtls/compat-1.3.h index a58b47243..361cf569c 100644 --- a/include/mbedtls/compat-1.3.h +++ b/include/mbedtls/compat-1.3.h @@ -26,7 +26,7 @@ */ #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h index 56ad01c40..e795bb830 100644 --- a/include/mbedtls/config.h +++ b/include/mbedtls/config.h @@ -2000,6 +2000,6 @@ #include MBEDTLS_USER_CONFIG_FILE #endif -#include "check_config.h" +#include "mbedtls/check_config.h" #endif /* MBEDTLS_CONFIG_H */ diff --git a/include/mbedtls/ctr_drbg.h b/include/mbedtls/ctr_drbg.h index cc3df7b11..ffaf8ad79 100644 --- a/include/mbedtls/ctr_drbg.h +++ b/include/mbedtls/ctr_drbg.h @@ -37,15 +37,15 @@ #define MBEDTLS_CTR_DRBG_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "aes.h" +#include "mbedtls/aes.h" #if defined(MBEDTLS_THREADING_C) -#include "threading.h" +#include "mbedtls/threading.h" #endif #define MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED -0x0034 /**< The entropy source failed. */ diff --git a/include/mbedtls/des.h b/include/mbedtls/des.h index 54e6b7894..1c80b5365 100644 --- a/include/mbedtls/des.h +++ b/include/mbedtls/des.h @@ -30,7 +30,7 @@ #define MBEDTLS_DES_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/dhm.h b/include/mbedtls/dhm.h index 49eb6a47e..831cfd74b 100644 --- a/include/mbedtls/dhm.h +++ b/include/mbedtls/dhm.h @@ -66,11 +66,11 @@ #define MBEDTLS_DHM_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "bignum.h" +#include "mbedtls/bignum.h" /* * DHM Error codes diff --git a/include/mbedtls/ecdh.h b/include/mbedtls/ecdh.h index 384c3dc07..d870a5bd5 100644 --- a/include/mbedtls/ecdh.h +++ b/include/mbedtls/ecdh.h @@ -35,12 +35,12 @@ #define MBEDTLS_ECDH_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "ecp.h" +#include "mbedtls/ecp.h" #ifdef __cplusplus extern "C" { diff --git a/include/mbedtls/ecdsa.h b/include/mbedtls/ecdsa.h index 294394551..effbb1ed0 100644 --- a/include/mbedtls/ecdsa.h +++ b/include/mbedtls/ecdsa.h @@ -33,13 +33,13 @@ #define MBEDTLS_ECDSA_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "ecp.h" -#include "md.h" +#include "mbedtls/ecp.h" +#include "mbedtls/md.h" /** * \brief Maximum ECDSA signature size for a given curve bit size diff --git a/include/mbedtls/ecjpake.h b/include/mbedtls/ecjpake.h index 3d8d02ae6..97387c3b4 100644 --- a/include/mbedtls/ecjpake.h +++ b/include/mbedtls/ecjpake.h @@ -41,13 +41,13 @@ * also be use outside TLS. */ #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "ecp.h" -#include "md.h" +#include "mbedtls/ecp.h" +#include "mbedtls/md.h" #ifdef __cplusplus extern "C" { diff --git a/include/mbedtls/ecp.h b/include/mbedtls/ecp.h index 1a6ec13c1..6aa677ad0 100644 --- a/include/mbedtls/ecp.h +++ b/include/mbedtls/ecp.h @@ -37,12 +37,12 @@ #define MBEDTLS_ECP_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "bignum.h" +#include "mbedtls/bignum.h" /* * ECP error codes diff --git a/include/mbedtls/ecp_internal.h b/include/mbedtls/ecp_internal.h index 7625ed48e..3b6fbf112 100644 --- a/include/mbedtls/ecp_internal.h +++ b/include/mbedtls/ecp_internal.h @@ -62,7 +62,7 @@ #define MBEDTLS_ECP_INTERNAL_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/entropy.h b/include/mbedtls/entropy.h index ca06dc3c5..06aaffaf7 100644 --- a/include/mbedtls/entropy.h +++ b/include/mbedtls/entropy.h @@ -25,7 +25,7 @@ #define MBEDTLS_ENTROPY_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif @@ -33,21 +33,21 @@ #include #if defined(MBEDTLS_SHA512_C) && !defined(MBEDTLS_ENTROPY_FORCE_SHA256) -#include "sha512.h" +#include "mbedtls/sha512.h" #define MBEDTLS_ENTROPY_SHA512_ACCUMULATOR #else #if defined(MBEDTLS_SHA256_C) #define MBEDTLS_ENTROPY_SHA256_ACCUMULATOR -#include "sha256.h" +#include "mbedtls/sha256.h" #endif #endif #if defined(MBEDTLS_THREADING_C) -#include "threading.h" +#include "mbedtls/threading.h" #endif #if defined(MBEDTLS_HAVEGE_C) -#include "havege.h" +#include "mbedtls/havege.h" #endif #define MBEDTLS_ERR_ENTROPY_SOURCE_FAILED -0x003C /**< Critical entropy source failure. */ diff --git a/include/mbedtls/entropy_poll.h b/include/mbedtls/entropy_poll.h index 94dd657eb..ba42805f0 100644 --- a/include/mbedtls/entropy_poll.h +++ b/include/mbedtls/entropy_poll.h @@ -25,7 +25,7 @@ #define MBEDTLS_ENTROPY_POLL_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/error.h b/include/mbedtls/error.h index bee0fe485..9edafea14 100644 --- a/include/mbedtls/error.h +++ b/include/mbedtls/error.h @@ -25,7 +25,7 @@ #define MBEDTLS_ERROR_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/gcm.h b/include/mbedtls/gcm.h index fd130abd7..a71a2af46 100644 --- a/include/mbedtls/gcm.h +++ b/include/mbedtls/gcm.h @@ -34,12 +34,12 @@ #define MBEDTLS_GCM_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "cipher.h" +#include "mbedtls/cipher.h" #include diff --git a/include/mbedtls/havege.h b/include/mbedtls/havege.h index 749257a36..acd7e489a 100644 --- a/include/mbedtls/havege.h +++ b/include/mbedtls/havege.h @@ -25,7 +25,7 @@ #define MBEDTLS_HAVEGE_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/hkdf.h b/include/mbedtls/hkdf.h index 40ee64eb0..20f325dd8 100644 --- a/include/mbedtls/hkdf.h +++ b/include/mbedtls/hkdf.h @@ -28,12 +28,12 @@ #define MBEDTLS_HKDF_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "md.h" +#include "mbedtls/md.h" /** * \name HKDF Error codes diff --git a/include/mbedtls/hmac_drbg.h b/include/mbedtls/hmac_drbg.h index f1289cb30..46536a1f4 100644 --- a/include/mbedtls/hmac_drbg.h +++ b/include/mbedtls/hmac_drbg.h @@ -25,15 +25,15 @@ #define MBEDTLS_HMAC_DRBG_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "md.h" +#include "mbedtls/md.h" #if defined(MBEDTLS_THREADING_C) -#include "threading.h" +#include "mbedtls/threading.h" #endif /* diff --git a/include/mbedtls/md.h b/include/mbedtls/md.h index 69ab21f40..0b0ec91ff 100644 --- a/include/mbedtls/md.h +++ b/include/mbedtls/md.h @@ -30,7 +30,7 @@ #include #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/md2.h b/include/mbedtls/md2.h index fe97cf08d..df1d5f7e6 100644 --- a/include/mbedtls/md2.h +++ b/include/mbedtls/md2.h @@ -30,7 +30,7 @@ #define MBEDTLS_MD2_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/md4.h b/include/mbedtls/md4.h index ce703c0ba..e7accd455 100644 --- a/include/mbedtls/md4.h +++ b/include/mbedtls/md4.h @@ -30,7 +30,7 @@ #define MBEDTLS_MD4_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/md5.h b/include/mbedtls/md5.h index 6eed6cc86..4206c1fbf 100644 --- a/include/mbedtls/md5.h +++ b/include/mbedtls/md5.h @@ -29,7 +29,7 @@ #define MBEDTLS_MD5_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/md_internal.h b/include/mbedtls/md_internal.h index 04de48291..267cebadc 100644 --- a/include/mbedtls/md_internal.h +++ b/include/mbedtls/md_internal.h @@ -29,12 +29,12 @@ #define MBEDTLS_MD_WRAP_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "md.h" +#include "mbedtls/md.h" #ifdef __cplusplus extern "C" { diff --git a/include/mbedtls/memory_buffer_alloc.h b/include/mbedtls/memory_buffer_alloc.h index 705f9a636..8e77f6f7c 100644 --- a/include/mbedtls/memory_buffer_alloc.h +++ b/include/mbedtls/memory_buffer_alloc.h @@ -25,7 +25,7 @@ #define MBEDTLS_MEMORY_BUFFER_ALLOC_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/nist_kw.h b/include/mbedtls/nist_kw.h index 3b67b59cd..b39406f44 100644 --- a/include/mbedtls/nist_kw.h +++ b/include/mbedtls/nist_kw.h @@ -38,12 +38,12 @@ #define MBEDTLS_NIST_KW_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "cipher.h" +#include "mbedtls/cipher.h" #ifdef __cplusplus extern "C" { diff --git a/include/mbedtls/oid.h b/include/mbedtls/oid.h index 17cdba74a..59ce0206b 100644 --- a/include/mbedtls/oid.h +++ b/include/mbedtls/oid.h @@ -25,22 +25,22 @@ #define MBEDTLS_OID_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "asn1.h" -#include "pk.h" +#include "mbedtls/asn1.h" +#include "mbedtls/pk.h" #include #if defined(MBEDTLS_CIPHER_C) -#include "cipher.h" +#include "mbedtls/cipher.h" #endif #if defined(MBEDTLS_MD_C) -#include "md.h" +#include "mbedtls/md.h" #endif #define MBEDTLS_ERR_OID_NOT_FOUND -0x002E /**< OID is not found. */ diff --git a/include/mbedtls/padlock.h b/include/mbedtls/padlock.h index 721a5d493..513d72f3d 100644 --- a/include/mbedtls/padlock.h +++ b/include/mbedtls/padlock.h @@ -29,12 +29,12 @@ #define MBEDTLS_PADLOCK_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "aes.h" +#include "mbedtls/aes.h" #define MBEDTLS_ERR_PADLOCK_DATA_MISALIGNED -0x0030 /**< Input data should be aligned. */ diff --git a/include/mbedtls/pem.h b/include/mbedtls/pem.h index a29e9ce30..02a94af5b 100644 --- a/include/mbedtls/pem.h +++ b/include/mbedtls/pem.h @@ -25,7 +25,7 @@ #define MBEDTLS_PEM_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/pk.h b/include/mbedtls/pk.h index 24951a6e1..eedcfeab9 100644 --- a/include/mbedtls/pk.h +++ b/include/mbedtls/pk.h @@ -26,23 +26,23 @@ #define MBEDTLS_PK_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "md.h" +#include "mbedtls/md.h" #if defined(MBEDTLS_RSA_C) -#include "rsa.h" +#include "mbedtls/rsa.h" #endif #if defined(MBEDTLS_ECP_C) -#include "ecp.h" +#include "mbedtls/ecp.h" #endif #if defined(MBEDTLS_ECDSA_C) -#include "ecdsa.h" +#include "mbedtls/ecdsa.h" #endif #if defined(MBEDTLS_USE_PSA_CRYPTO) diff --git a/include/mbedtls/pk_internal.h b/include/mbedtls/pk_internal.h index fc9ba13fe..7ef6322e4 100644 --- a/include/mbedtls/pk_internal.h +++ b/include/mbedtls/pk_internal.h @@ -26,12 +26,12 @@ #define MBEDTLS_PK_WRAP_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "pk.h" +#include "mbedtls/pk.h" struct mbedtls_pk_info_t { diff --git a/include/mbedtls/pkcs12.h b/include/mbedtls/pkcs12.h index d441357b7..9d42d7ffe 100644 --- a/include/mbedtls/pkcs12.h +++ b/include/mbedtls/pkcs12.h @@ -25,14 +25,14 @@ #define MBEDTLS_PKCS12_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "md.h" -#include "cipher.h" -#include "asn1.h" +#include "mbedtls/md.h" +#include "mbedtls/cipher.h" +#include "mbedtls/asn1.h" #include diff --git a/include/mbedtls/pkcs5.h b/include/mbedtls/pkcs5.h index c92185f7a..bbec7e7ed 100644 --- a/include/mbedtls/pkcs5.h +++ b/include/mbedtls/pkcs5.h @@ -27,13 +27,13 @@ #define MBEDTLS_PKCS5_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "asn1.h" -#include "md.h" +#include "mbedtls/asn1.h" +#include "mbedtls/md.h" #include #include diff --git a/include/mbedtls/platform.h b/include/mbedtls/platform.h index 801a948bc..bc0c17dfa 100644 --- a/include/mbedtls/platform.h +++ b/include/mbedtls/platform.h @@ -34,13 +34,13 @@ #define MBEDTLS_PLATFORM_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif #if defined(MBEDTLS_HAVE_TIME) -#include "platform_time.h" +#include "mbedtls/platform_time.h" #endif #define MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED -0x0070 /**< Hardware accelerator failed */ diff --git a/include/mbedtls/platform_time.h b/include/mbedtls/platform_time.h index 2ed36f56c..fe484fd75 100644 --- a/include/mbedtls/platform_time.h +++ b/include/mbedtls/platform_time.h @@ -25,7 +25,7 @@ #define MBEDTLS_PLATFORM_TIME_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/platform_util.h b/include/mbedtls/platform_util.h index dba6d4598..b0e72ad14 100644 --- a/include/mbedtls/platform_util.h +++ b/include/mbedtls/platform_util.h @@ -26,14 +26,14 @@ #define MBEDTLS_PLATFORM_UTIL_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif #include #if defined(MBEDTLS_HAVE_TIME_DATE) -#include "platform_time.h" +#include "mbedtls/platform_time.h" #include #endif /* MBEDTLS_HAVE_TIME_DATE */ diff --git a/include/mbedtls/poly1305.h b/include/mbedtls/poly1305.h index f0ec44c96..05866a2da 100644 --- a/include/mbedtls/poly1305.h +++ b/include/mbedtls/poly1305.h @@ -34,7 +34,7 @@ #define MBEDTLS_POLY1305_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/psa_util.h b/include/mbedtls/psa_util.h index b0c042827..ab3c3bbf2 100644 --- a/include/mbedtls/psa_util.h +++ b/include/mbedtls/psa_util.h @@ -29,7 +29,7 @@ #define MBEDTLS_PSA_UTIL_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif @@ -38,10 +38,10 @@ #include "psa/crypto.h" -#include "ecp.h" -#include "md.h" -#include "pk.h" -#include "oid.h" +#include "mbedtls/ecp.h" +#include "mbedtls/md.h" +#include "mbedtls/pk.h" +#include "mbedtls/oid.h" #include diff --git a/include/mbedtls/ripemd160.h b/include/mbedtls/ripemd160.h index b42f6d2a9..be048c01f 100644 --- a/include/mbedtls/ripemd160.h +++ b/include/mbedtls/ripemd160.h @@ -25,7 +25,7 @@ #define MBEDTLS_RIPEMD160_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/rsa.h b/include/mbedtls/rsa.h index 489f2ed45..840540b0d 100644 --- a/include/mbedtls/rsa.h +++ b/include/mbedtls/rsa.h @@ -31,16 +31,16 @@ #define MBEDTLS_RSA_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "bignum.h" -#include "md.h" +#include "mbedtls/bignum.h" +#include "mbedtls/md.h" #if defined(MBEDTLS_THREADING_C) -#include "threading.h" +#include "mbedtls/threading.h" #endif /* diff --git a/include/mbedtls/rsa_internal.h b/include/mbedtls/rsa_internal.h index 53abd3c5b..c1c844ef7 100644 --- a/include/mbedtls/rsa_internal.h +++ b/include/mbedtls/rsa_internal.h @@ -58,12 +58,12 @@ #define MBEDTLS_RSA_INTERNAL_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif -#include "bignum.h" +#include "mbedtls/bignum.h" #ifdef __cplusplus extern "C" { diff --git a/include/mbedtls/sha1.h b/include/mbedtls/sha1.h index bb6ecf05a..988d2f93d 100644 --- a/include/mbedtls/sha1.h +++ b/include/mbedtls/sha1.h @@ -32,7 +32,7 @@ #define MBEDTLS_SHA1_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/sha256.h b/include/mbedtls/sha256.h index d64739820..1c5974021 100644 --- a/include/mbedtls/sha256.h +++ b/include/mbedtls/sha256.h @@ -28,7 +28,7 @@ #define MBEDTLS_SHA256_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/sha512.h b/include/mbedtls/sha512.h index c06ceed1d..48923e5bc 100644 --- a/include/mbedtls/sha512.h +++ b/include/mbedtls/sha512.h @@ -27,7 +27,7 @@ #define MBEDTLS_SHA512_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/threading.h b/include/mbedtls/threading.h index 92e6e6b98..cab40f71a 100644 --- a/include/mbedtls/threading.h +++ b/include/mbedtls/threading.h @@ -25,7 +25,7 @@ #define MBEDTLS_THREADING_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/timing.h b/include/mbedtls/timing.h index a965fe0d3..b264a5a95 100644 --- a/include/mbedtls/timing.h +++ b/include/mbedtls/timing.h @@ -25,7 +25,7 @@ #define MBEDTLS_TIMING_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/version.h b/include/mbedtls/version.h index 79b42b26c..fd7783044 100644 --- a/include/mbedtls/version.h +++ b/include/mbedtls/version.h @@ -29,7 +29,7 @@ #define MBEDTLS_VERSION_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/mbedtls/xtea.h b/include/mbedtls/xtea.h index b47f55350..2dc0afc73 100644 --- a/include/mbedtls/xtea.h +++ b/include/mbedtls/xtea.h @@ -25,7 +25,7 @@ #define MBEDTLS_XTEA_H #if !defined(MBEDTLS_CONFIG_FILE) -#include "config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif