Skip to content

Commit 203fdf7

Browse files
PataterPatater
committed
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.
1 parent ee6f9b2 commit 203fdf7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+123
-123
lines changed

‎configs/config-no-entropy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,6 @@
8181
/* Miscellaneous options */
8282
#define MBEDTLS_AES_ROM_TABLES
8383

84-
#include "check_config.h"
84+
#include "mbedtls/check_config.h"
8585

8686
#endif /* MBEDTLS_CONFIG_H */

‎configs/config-psa-crypto.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1971,6 +1971,6 @@
19711971
#include MBEDTLS_USER_CONFIG_FILE
19721972
#endif
19731973

1974-
#include "check_config.h"
1974+
#include "mbedtls/check_config.h"
19751975

19761976
#endif /* MBEDTLS_CONFIG_H */

‎include/mbedtls/aes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#define MBEDTLS_AES_H
4343

4444
#if !defined(MBEDTLS_CONFIG_FILE)
45-
#include "config.h"
45+
#include "mbedtls/config.h"
4646
#else
4747
#include MBEDTLS_CONFIG_FILE
4848
#endif

‎include/mbedtls/aesni.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
#define MBEDTLS_AESNI_H
2929

3030
#if !defined(MBEDTLS_CONFIG_FILE)
31-
#include "config.h"
31+
#include "mbedtls/config.h"
3232
#else
3333
#include MBEDTLS_CONFIG_FILE
3434
#endif
3535

36-
#include "aes.h"
36+
#include "mbedtls/aes.h"
3737

3838
#define MBEDTLS_AESNI_AES 0x02000000u
3939
#define MBEDTLS_AESNI_CLMUL 0x00000002u

‎include/mbedtls/arc4.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#define MBEDTLS_ARC4_H
3030

3131
#if !defined(MBEDTLS_CONFIG_FILE)
32-
#include "config.h"
32+
#include "mbedtls/config.h"
3333
#else
3434
#include MBEDTLS_CONFIG_FILE
3535
#endif

‎include/mbedtls/aria.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131
#define MBEDTLS_ARIA_H
3232

3333
#if !defined(MBEDTLS_CONFIG_FILE)
34-
#include "config.h"
34+
#include "mbedtls/config.h"
3535
#else
3636
#include MBEDTLS_CONFIG_FILE
3737
#endif
3838

3939
#include <stddef.h>
4040
#include <stdint.h>
4141

42-
#include "platform_util.h"
42+
#include "mbedtls/platform_util.h"
4343

4444
#define MBEDTLS_ARIA_ENCRYPT 1 /**< ARIA encryption. */
4545
#define MBEDTLS_ARIA_DECRYPT 0 /**< ARIA decryption. */

‎include/mbedtls/asn1.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
#define MBEDTLS_ASN1_H
2626

2727
#if !defined(MBEDTLS_CONFIG_FILE)
28-
#include "config.h"
28+
#include "mbedtls/config.h"
2929
#else
3030
#include MBEDTLS_CONFIG_FILE
3131
#endif
3232

3333
#include <stddef.h>
3434

3535
#if defined(MBEDTLS_BIGNUM_C)
36-
#include "bignum.h"
36+
#include "mbedtls/bignum.h"
3737
#endif
3838

3939
/**

‎include/mbedtls/asn1write.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
#define MBEDTLS_ASN1_WRITE_H
2626

2727
#if !defined(MBEDTLS_CONFIG_FILE)
28-
#include "config.h"
28+
#include "mbedtls/config.h"
2929
#else
3030
#include MBEDTLS_CONFIG_FILE
3131
#endif
3232

33-
#include "asn1.h"
33+
#include "mbedtls/asn1.h"
3434

3535
#define MBEDTLS_ASN1_CHK_ADD(g, f) \
3636
do \

‎include/mbedtls/base64.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#define MBEDTLS_BASE64_H
2626

2727
#if !defined(MBEDTLS_CONFIG_FILE)
28-
#include "config.h"
28+
#include "mbedtls/config.h"
2929
#else
3030
#include MBEDTLS_CONFIG_FILE
3131
#endif

‎include/mbedtls/bignum.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#define MBEDTLS_BIGNUM_H
2626

2727
#if !defined(MBEDTLS_CONFIG_FILE)
28-
#include "config.h"
28+
#include "mbedtls/config.h"
2929
#else
3030
#include MBEDTLS_CONFIG_FILE
3131
#endif

‎include/mbedtls/blowfish.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
#define MBEDTLS_BLOWFISH_H
2626

2727
#if !defined(MBEDTLS_CONFIG_FILE)
28-
#include "config.h"
28+
#include "mbedtls/config.h"
2929
#else
3030
#include MBEDTLS_CONFIG_FILE
3131
#endif
3232

3333
#include <stddef.h>
3434
#include <stdint.h>
3535

36-
#include "platform_util.h"
36+
#include "mbedtls/platform_util.h"
3737

3838
#define MBEDTLS_BLOWFISH_ENCRYPT 1
3939
#define MBEDTLS_BLOWFISH_DECRYPT 0

‎include/mbedtls/bn_mul.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
#define MBEDTLS_BN_MUL_H
4040

4141
#if !defined(MBEDTLS_CONFIG_FILE)
42-
#include "config.h"
42+
#include "mbedtls/config.h"
4343
#else
4444
#include MBEDTLS_CONFIG_FILE
4545
#endif
4646

47-
#include "bignum.h"
47+
#include "mbedtls/bignum.h"
4848

4949
#if defined(MBEDTLS_HAVE_ASM)
5050

‎include/mbedtls/camellia.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
#define MBEDTLS_CAMELLIA_H
2626

2727
#if !defined(MBEDTLS_CONFIG_FILE)
28-
#include "config.h"
28+
#include "mbedtls/config.h"
2929
#else
3030
#include MBEDTLS_CONFIG_FILE
3131
#endif
3232

3333
#include <stddef.h>
3434
#include <stdint.h>
3535

36-
#include "platform_util.h"
36+
#include "mbedtls/platform_util.h"
3737

3838
#define MBEDTLS_CAMELLIA_ENCRYPT 1
3939
#define MBEDTLS_CAMELLIA_DECRYPT 0

‎include/mbedtls/ccm.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@
5050
#define MBEDTLS_CCM_H
5151

5252
#if !defined(MBEDTLS_CONFIG_FILE)
53-
#include "config.h"
53+
#include "mbedtls/config.h"
5454
#else
5555
#include MBEDTLS_CONFIG_FILE
5656
#endif
5757

58-
#include "cipher.h"
58+
#include "mbedtls/cipher.h"
5959

6060
#define MBEDTLS_ERR_CCM_BAD_INPUT -0x000D /**< Bad input parameters to the function. */
6161
#define MBEDTLS_ERR_CCM_AUTH_FAILED -0x000F /**< Authenticated decryption failed. */

‎include/mbedtls/certs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#define MBEDTLS_CERTS_H
2626

2727
#if !defined(MBEDTLS_CONFIG_FILE)
28-
#include "config.h"
28+
#include "mbedtls/config.h"
2929
#else
3030
#include MBEDTLS_CONFIG_FILE
3131
#endif

‎include/mbedtls/chacha20.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#define MBEDTLS_CHACHA20_H
3535

3636
#if !defined(MBEDTLS_CONFIG_FILE)
37-
#include "config.h"
37+
#include "mbedtls/config.h"
3838
#else
3939
#include MBEDTLS_CONFIG_FILE
4040
#endif

‎include/mbedtls/chachapoly.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
#define MBEDTLS_CHACHAPOLY_H
3535

3636
#if !defined(MBEDTLS_CONFIG_FILE)
37-
#include "config.h"
37+
#include "mbedtls/config.h"
3838
#else
3939
#include MBEDTLS_CONFIG_FILE
4040
#endif
4141

4242
/* for shared error codes */
43-
#include "poly1305.h"
43+
#include "mbedtls/poly1305.h"
4444

4545
#define MBEDTLS_ERR_CHACHAPOLY_BAD_STATE -0x0054 /**< The requested operation is not permitted in the current state. */
4646
#define MBEDTLS_ERR_CHACHAPOLY_AUTH_FAILED -0x0056 /**< Authenticated decryption failed: data was not authentic. */
@@ -58,7 +58,7 @@ mbedtls_chachapoly_mode_t;
5858

5959
#if !defined(MBEDTLS_CHACHAPOLY_ALT)
6060

61-
#include "chacha20.h"
61+
#include "mbedtls/chacha20.h"
6262

6363
typedef struct mbedtls_chachapoly_context
6464
{

‎include/mbedtls/cipher.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
#define MBEDTLS_CIPHER_H
3131

3232
#if !defined(MBEDTLS_CONFIG_FILE)
33-
#include "config.h"
33+
#include "mbedtls/config.h"
3434
#else
3535
#include MBEDTLS_CONFIG_FILE
3636
#endif
3737

3838
#include <stddef.h>
39-
#include "platform_util.h"
39+
#include "mbedtls/platform_util.h"
4040

4141
#if defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CCM_C) || defined(MBEDTLS_CHACHAPOLY_C)
4242
#define MBEDTLS_CIPHER_MODE_AEAD

‎include/mbedtls/cipher_internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
#define MBEDTLS_CIPHER_WRAP_H
2828

2929
#if !defined(MBEDTLS_CONFIG_FILE)
30-
#include "config.h"
30+
#include "mbedtls/config.h"
3131
#else
3232
#include MBEDTLS_CONFIG_FILE
3333
#endif
3434

35-
#include "cipher.h"
35+
#include "mbedtls/cipher.h"
3636

3737
#if defined(MBEDTLS_USE_PSA_CRYPTO)
3838
#include "psa/crypto.h"

‎include/mbedtls/cmac.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
#define MBEDTLS_CMAC_H
3030

3131
#if !defined(MBEDTLS_CONFIG_FILE)
32-
#include "config.h"
32+
#include "mbedtls/config.h"
3333
#else
3434
#include MBEDTLS_CONFIG_FILE
3535
#endif
3636

37-
#include "cipher.h"
37+
#include "mbedtls/cipher.h"
3838

3939
#ifdef __cplusplus
4040
extern "C" {

‎include/mbedtls/compat-1.3.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*/
2727

2828
#if !defined(MBEDTLS_CONFIG_FILE)
29-
#include "config.h"
29+
#include "mbedtls/config.h"
3030
#else
3131
#include MBEDTLS_CONFIG_FILE
3232
#endif

‎include/mbedtls/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2000,6 +2000,6 @@
20002000
#include MBEDTLS_USER_CONFIG_FILE
20012001
#endif
20022002

2003-
#include "check_config.h"
2003+
#include "mbedtls/check_config.h"
20042004

20052005
#endif /* MBEDTLS_CONFIG_H */

‎include/mbedtls/ctr_drbg.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@
3737
#define MBEDTLS_CTR_DRBG_H
3838

3939
#if !defined(MBEDTLS_CONFIG_FILE)
40-
#include "config.h"
40+
#include "mbedtls/config.h"
4141
#else
4242
#include MBEDTLS_CONFIG_FILE
4343
#endif
4444

45-
#include "aes.h"
45+
#include "mbedtls/aes.h"
4646

4747
#if defined(MBEDTLS_THREADING_C)
48-
#include "threading.h"
48+
#include "mbedtls/threading.h"
4949
#endif
5050

5151
#define MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED -0x0034 /**< The entropy source failed. */

‎include/mbedtls/des.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define MBEDTLS_DES_H
3131

3232
#if !defined(MBEDTLS_CONFIG_FILE)
33-
#include "config.h"
33+
#include "mbedtls/config.h"
3434
#else
3535
#include MBEDTLS_CONFIG_FILE
3636
#endif

‎include/mbedtls/dhm.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@
6666
#define MBEDTLS_DHM_H
6767

6868
#if !defined(MBEDTLS_CONFIG_FILE)
69-
#include "config.h"
69+
#include "mbedtls/config.h"
7070
#else
7171
#include MBEDTLS_CONFIG_FILE
7272
#endif
73-
#include "bignum.h"
73+
#include "mbedtls/bignum.h"
7474

7575
/*
7676
* DHM Error codes

‎include/mbedtls/ecdh.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
#define MBEDTLS_ECDH_H
3636

3737
#if !defined(MBEDTLS_CONFIG_FILE)
38-
#include "config.h"
38+
#include "mbedtls/config.h"
3939
#else
4040
#include MBEDTLS_CONFIG_FILE
4141
#endif
4242

43-
#include "ecp.h"
43+
#include "mbedtls/ecp.h"
4444

4545
#ifdef __cplusplus
4646
extern "C" {

‎include/mbedtls/ecdsa.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
#define MBEDTLS_ECDSA_H
3434

3535
#if !defined(MBEDTLS_CONFIG_FILE)
36-
#include "config.h"
36+
#include "mbedtls/config.h"
3737
#else
3838
#include MBEDTLS_CONFIG_FILE
3939
#endif
4040

41-
#include "ecp.h"
42-
#include "md.h"
41+
#include "mbedtls/ecp.h"
42+
#include "mbedtls/md.h"
4343

4444
/**
4545
* \brief Maximum ECDSA signature size for a given curve bit size

‎include/mbedtls/ecjpake.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141
* also be use outside TLS.
4242
*/
4343
#if !defined(MBEDTLS_CONFIG_FILE)
44-
#include "config.h"
44+
#include "mbedtls/config.h"
4545
#else
4646
#include MBEDTLS_CONFIG_FILE
4747
#endif
4848

49-
#include "ecp.h"
50-
#include "md.h"
49+
#include "mbedtls/ecp.h"
50+
#include "mbedtls/md.h"
5151

5252
#ifdef __cplusplus
5353
extern "C" {

‎include/mbedtls/ecp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
#define MBEDTLS_ECP_H
3838

3939
#if !defined(MBEDTLS_CONFIG_FILE)
40-
#include "config.h"
40+
#include "mbedtls/config.h"
4141
#else
4242
#include MBEDTLS_CONFIG_FILE
4343
#endif
4444

45-
#include "bignum.h"
45+
#include "mbedtls/bignum.h"
4646

4747
/*
4848
* ECP error codes

0 commit comments

Comments
 (0)