Skip to content

Commit 82fbdec

Browse files
committed
Fixes configurations changed by target_config.h removal
1 parent 513fb14 commit 82fbdec

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

core/mbedtls/importer/adjust-config.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ conf unset MBEDTLS_NET_C
3030
conf unset MBEDTLS_TIMING_C
3131

3232
# not supported on all targets with mbed OS, nor used by mbed Client
33+
conf unset MBEDTLS_HAVE_TIME_DATE
3334
conf unset MBEDTLS_FS_IO
35+
conf set MBEDTLS_NO_PLATFORM_ENTROPY
3436

3537
conf unset MBEDTLS_CIPHER_MODE_CFB
3638
conf unset MBEDTLS_CIPHER_MODE_CTR

core/mbedtls/inc/mbedtls/config.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
*
8686
* Comment if your system does not have a correct clock.
8787
*/
88-
#define MBEDTLS_HAVE_TIME_DATE
88+
//#define MBEDTLS_HAVE_TIME_DATE
8989

9090
/**
9191
* \def MBEDTLS_PLATFORM_MEMORY
@@ -781,7 +781,7 @@
781781
*
782782
* Uncomment this macro to disable the built-in platform entropy functions.
783783
*/
784-
//#define MBEDTLS_NO_PLATFORM_ENTROPY
784+
#define MBEDTLS_NO_PLATFORM_ENTROPY
785785

786786
/**
787787
* \def MBEDTLS_ENTROPY_FORCE_SHA256
@@ -2513,11 +2513,7 @@
25132513
/* X509 options */
25142514
//#define MBEDTLS_X509_MAX_INTERMEDIATE_CA 8 /**< Maximum number of intermediate CAs in a verification chain. */
25152515

2516-
/* \} name SECTION: Module configuration options */
2517-
2518-
#if defined(TARGET_LIKE_MBED)
2519-
#include "mbedtls/target_config.h"
2520-
#endif
2516+
/* \} name SECTION: Customisation configuration options */
25212517

25222518
/*
25232519
* Allow user to override any previous default.

0 commit comments

Comments
 (0)