From d58a00d5b78a04e35cfd038663e817b220f510e5 Mon Sep 17 00:00:00 2001 From: Jaeden Amero Date: Fri, 7 Jun 2019 11:49:59 +0100 Subject: [PATCH] psa: Avoid use of relative include paths Relative include paths should be avoided. The build system will determine where to pull in includes from. Specifically, `#include "../mbedtls/config.h"` shouldn't be used. Use `#include "mbedtls/config.h` instead, so that the submodule-building makefiles can change which directory to use to get mbedtls include files from. Fixes #141 --- include/psa/crypto_platform.h | 2 +- include/psa/crypto_sizes.h | 2 +- include/psa/crypto_struct.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/psa/crypto_platform.h b/include/psa/crypto_platform.h index 42cdad32a..86af08f91 100644 --- a/include/psa/crypto_platform.h +++ b/include/psa/crypto_platform.h @@ -38,7 +38,7 @@ /* Include the Mbed TLS configuration file, the way Mbed TLS does it * in each of its header files. */ #if !defined(MBEDTLS_CONFIG_FILE) -#include "../mbedtls/config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/psa/crypto_sizes.h b/include/psa/crypto_sizes.h index 3cb0c73ab..f360fd627 100644 --- a/include/psa/crypto_sizes.h +++ b/include/psa/crypto_sizes.h @@ -45,7 +45,7 @@ /* Include the Mbed TLS configuration file, the way Mbed TLS does it * in each of its header files. */ #if !defined(MBEDTLS_CONFIG_FILE) -#include "../mbedtls/config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif diff --git a/include/psa/crypto_struct.h b/include/psa/crypto_struct.h index 88503572f..53da2a8f2 100644 --- a/include/psa/crypto_struct.h +++ b/include/psa/crypto_struct.h @@ -38,7 +38,7 @@ /* Include the Mbed TLS configuration file, the way Mbed TLS does it * in each of its header files. */ #if !defined(MBEDTLS_CONFIG_FILE) -#include "../mbedtls/config.h" +#include "mbedtls/config.h" #else #include MBEDTLS_CONFIG_FILE #endif