Commit d4394c2f authored by Tomi Fontanilles's avatar Tomi Fontanilles Committed by Andrzej Puzdrowski
Browse files

mbedtls config: fix too early check_config.h includes 



check_config.h was included manually by custom configuration files.
This caused compilation errors when updating MbedTLS to 3.6.0
because check_config.h was processed too early, before the whole
configuration is defined, effectively causing configuration check errors.

MbedTLS already takes care of including check_config.h at the right time.
Remove those erroneous manual check_config.h includes.

Signed-off-by: default avatarTomi Fontanilles <tomi.fontanilles@nordicsemi.no>
parent 78bfe750

boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 


#ifdef FIH_ENABLE_DELAY



#include "mcuboot-mbedtls-cfg.h"

#include "mbedtls/ctr_drbg.h"

#include "mbedtls/entropy.h"

boot/cypress/MCUBootApp/config/mcuboot_crypto_config.h

+0 −2
Original line number Diff line number Diff line
@@ -3596,8 +3596,6 @@ 
#include MBEDTLS_USER_CONFIG_FILE

#endif



#include "mbedtls/check_config.h"



#ifdef MCUBOOT_ENC_IMAGES

#define MBEDTLS_SHA256_DIGEST_SIZE (32)

#define MBEDTLS_AES_KEY_SIZE 16

boot/zephyr/include/config-asn1.h

+0 −2
Original line number Diff line number Diff line
@@ -41,6 +41,4 @@ 
// #define MBEDTLS_OID_C

// #define MBEDTLS_SHA256_C



#include "mbedtls/check_config.h"



#endif /* MBEDTLS_CONFIG_ASN1_H */

boot/zephyr/include/config-ec.h

+0 −2
Original line number Diff line number Diff line
@@ -91,6 +91,4 @@ 
#define MBEDTLS_NIST_KW_C

#endif /* MCUBOOT_ENC_IMAGES */



#include "mbedtls/check_config.h"



#endif /* MCUBOOT_MBEDTLS_CONFIG_ECDSA */

boot/zephyr/include/config-ed25519.h

+0 −2
Original line number Diff line number Diff line
@@ -73,6 +73,4 @@ 
/* Save ROM and a few bytes of RAM by specifying our own ciphersuite list */

#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8



#include "mbedtls/check_config.h"



#endif /* MCUBOOT_MBEDTLS_CONFIG_RSA */

CRA Git | Maintained and supported by SUSTech CRA and CCSE