mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-25 13:43:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use mbedtls-based path for includes

Browse Source 
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.
This commit is contained in:
Jaeden Amero 2019-07-04 20:01:14 +01:00
parent 78d9d0c1e9
commit 6609aef809
19 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mbedtls/certs.h
View File

@ -25,7 +25,7 @@
#define MBEDTLS_CERTS_H #define MBEDTLS_CERTS_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif

2
include/mbedtls/compat-1.3.h
View File

@ -26,7 +26,7 @@
*/ */
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif

2
include/mbedtls/config.h
View File

@ -3546,6 +3546,6 @@
#include MBEDTLS_USER_CONFIG_FILE #include MBEDTLS_USER_CONFIG_FILE
#endif #endif
#include "check_config.h" #include "mbedtls/check_config.h"
#endif /* MBEDTLS_CONFIG_H */ #endif /* MBEDTLS_CONFIG_H */

6
include/mbedtls/debug.h
View File

@ -25,15 +25,15 @@
#define MBEDTLS_DEBUG_H #define MBEDTLS_DEBUG_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#include "ssl.h" #include "mbedtls/ssl.h"
#if defined(MBEDTLS_ECP_C) #if defined(MBEDTLS_ECP_C)
#include "ecp.h" #include "mbedtls/ecp.h"
#endif #endif
#if defined(MBEDTLS_DEBUG_C) #if defined(MBEDTLS_DEBUG_C)

2
include/mbedtls/error.h
View File

@ -25,7 +25,7 @@
#define MBEDTLS_ERROR_H #define MBEDTLS_ERROR_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif

4
include/mbedtls/net.h
View File

@ -24,13 +24,13 @@
* This file is part of mbed TLS (https://tls.mbed.org) * This file is part of mbed TLS (https://tls.mbed.org)
*/ */
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#if !defined(MBEDTLS_DEPRECATED_REMOVED) #if !defined(MBEDTLS_DEPRECATED_REMOVED)
#include "net_sockets.h" #include "mbedtls/net_sockets.h"
#if defined(MBEDTLS_DEPRECATED_WARNING) #if defined(MBEDTLS_DEPRECATED_WARNING)
#warning "Deprecated header file: Superseded by mbedtls/net_sockets.h" #warning "Deprecated header file: Superseded by mbedtls/net_sockets.h"
#endif /* MBEDTLS_DEPRECATED_WARNING */ #endif /* MBEDTLS_DEPRECATED_WARNING */

4
include/mbedtls/net_sockets.h
View File

@ -41,12 +41,12 @@
#define MBEDTLS_NET_SOCKETS_H #define MBEDTLS_NET_SOCKETS_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#include "ssl.h" #include "mbedtls/ssl.h"
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>

4
include/mbedtls/pkcs11.h
View File

@ -27,14 +27,14 @@
#define MBEDTLS_PKCS11_H #define MBEDTLS_PKCS11_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#if defined(MBEDTLS_PKCS11_C) #if defined(MBEDTLS_PKCS11_C)
#include "x509_crt.h" #include "mbedtls/x509_crt.h"
#include <pkcs11-helper-1.0/pkcs11h-certificate.h> #include <pkcs11-helper-1.0/pkcs11h-certificate.h>

18
include/mbedtls/ssl.h
View File

@ -25,27 +25,27 @@
#define MBEDTLS_SSL_H #define MBEDTLS_SSL_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#include "bignum.h" #include "mbedtls/bignum.h"
#include "ecp.h" #include "mbedtls/ecp.h"
#include "ssl_ciphersuites.h" #include "mbedtls/ssl_ciphersuites.h"
#if defined(MBEDTLS_X509_CRT_PARSE_C) #if defined(MBEDTLS_X509_CRT_PARSE_C)
#include "x509_crt.h" #include "mbedtls/x509_crt.h"
#include "x509_crl.h" #include "mbedtls/x509_crl.h"
#endif #endif
#if defined(MBEDTLS_DHM_C) #if defined(MBEDTLS_DHM_C)
#include "dhm.h" #include "mbedtls/dhm.h"
#endif #endif
#if defined(MBEDTLS_ECDH_C) #if defined(MBEDTLS_ECDH_C)
#include "ecdh.h" #include "mbedtls/ecdh.h"
#endif #endif
#if defined(MBEDTLS_ZLIB_SUPPORT) #if defined(MBEDTLS_ZLIB_SUPPORT)
@ -62,7 +62,7 @@
#endif #endif
#if defined(MBEDTLS_HAVE_TIME) #if defined(MBEDTLS_HAVE_TIME)
#include "platform_time.h" #include "mbedtls/platform_time.h"
#endif #endif
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)

6
include/mbedtls/ssl_cache.h
View File

@ -25,15 +25,15 @@
#define MBEDTLS_SSL_CACHE_H #define MBEDTLS_SSL_CACHE_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#include "ssl.h" #include "mbedtls/ssl.h"
#if defined(MBEDTLS_THREADING_C) #if defined(MBEDTLS_THREADING_C)
#include "threading.h" #include "mbedtls/threading.h"
#endif #endif
/** /**

8
include/mbedtls/ssl_ciphersuites.h
View File

@ -25,14 +25,14 @@
#define MBEDTLS_SSL_CIPHERSUITES_H #define MBEDTLS_SSL_CIPHERSUITES_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#include "pk.h" #include "mbedtls/pk.h"
#include "cipher.h" #include "mbedtls/cipher.h"
#include "md.h" #include "mbedtls/md.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

6
include/mbedtls/ssl_cookie.h
View File

@ -25,15 +25,15 @@
#define MBEDTLS_SSL_COOKIE_H #define MBEDTLS_SSL_COOKIE_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#include "ssl.h" #include "mbedtls/ssl.h"
#if defined(MBEDTLS_THREADING_C) #if defined(MBEDTLS_THREADING_C)
#include "threading.h" #include "mbedtls/threading.h"
#endif #endif
/** /**

18
include/mbedtls/ssl_internal.h
View File

@ -25,41 +25,41 @@
#define MBEDTLS_SSL_INTERNAL_H #define MBEDTLS_SSL_INTERNAL_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#include "ssl.h" #include "mbedtls/ssl.h"
#include "cipher.h" #include "mbedtls/cipher.h"
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
#include "psa/crypto.h" #include "psa/crypto.h"
#endif #endif
#if defined(MBEDTLS_MD5_C) #if defined(MBEDTLS_MD5_C)
#include "md5.h" #include "mbedtls/md5.h"
#endif #endif
#if defined(MBEDTLS_SHA1_C) #if defined(MBEDTLS_SHA1_C)
#include "sha1.h" #include "mbedtls/sha1.h"
#endif #endif
#if defined(MBEDTLS_SHA256_C) #if defined(MBEDTLS_SHA256_C)
#include "sha256.h" #include "mbedtls/sha256.h"
#endif #endif
#if defined(MBEDTLS_SHA512_C) #if defined(MBEDTLS_SHA512_C)
#include "sha512.h" #include "mbedtls/sha512.h"
#endif #endif
#if defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED) #if defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED)
#include "ecjpake.h" #include "mbedtls/ecjpake.h"
#endif #endif
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
#include "psa/crypto.h" #include "psa/crypto.h"
#include "psa_util.h" #include "mbedtls/psa_util.h"
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #endif /* MBEDTLS_USE_PSA_CRYPTO */
#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \ #if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \

8
include/mbedtls/ssl_ticket.h
View File

@ -25,7 +25,7 @@
#define MBEDTLS_SSL_TICKET_H #define MBEDTLS_SSL_TICKET_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
@ -36,11 +36,11 @@
* secrecy, when MBEDTLS_HAVE_TIME is defined. * secrecy, when MBEDTLS_HAVE_TIME is defined.
*/ */
#include "ssl.h" #include "mbedtls/ssl.h"
#include "cipher.h" #include "mbedtls/cipher.h"
#if defined(MBEDTLS_THREADING_C) #if defined(MBEDTLS_THREADING_C)
#include "threading.h" #include "mbedtls/threading.h"
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

2
include/mbedtls/version.h
View File

@ -29,7 +29,7 @@
#define MBEDTLS_VERSION_H #define MBEDTLS_VERSION_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif

8
include/mbedtls/x509.h
View File

@ -25,16 +25,16 @@
#define MBEDTLS_X509_H #define MBEDTLS_X509_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#include "asn1.h" #include "mbedtls/asn1.h"
#include "pk.h" #include "mbedtls/pk.h"
#if defined(MBEDTLS_RSA_C) #if defined(MBEDTLS_RSA_C)
#include "rsa.h" #include "mbedtls/rsa.h"
#endif #endif
/** /**

4
include/mbedtls/x509_crl.h
View File

@ -25,12 +25,12 @@
#define MBEDTLS_X509_CRL_H #define MBEDTLS_X509_CRL_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#include "x509.h" #include "mbedtls/x509.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

8
include/mbedtls/x509_crt.h
View File

@ -25,14 +25,14 @@
#define MBEDTLS_X509_CRT_H #define MBEDTLS_X509_CRT_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#include "x509.h" #include "mbedtls/x509.h"
#include "x509_crl.h" #include "mbedtls/x509_crl.h"
#include "bignum.h" #include "mbedtls/bignum.h"
/** /**
* \addtogroup x509_module * \addtogroup x509_module

4
include/mbedtls/x509_csr.h
View File

@ -25,12 +25,12 @@
#define MBEDTLS_X509_CSR_H #define MBEDTLS_X509_CSR_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h" #include "mbedtls/config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#include "x509.h" #include "mbedtls/x509.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {