feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/mbedtls_linux_entropy' into 'master'

Browse Source 
fix(mbedtls): allow to use built in entropy implementation for linux target

See merge request espressif/esp-idf!26413
This commit is contained in:
Mahavir Jain
2023-10-27 20:14:57 +08:00
parent cbb6fa0507 804ed172dd
commit fc1080dc6a
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/mbedtls/CMakeLists.txt
View File

@@ -192,8 +192,10 @@ if(AES_PERIPHERAL_TYPE STREQUAL "dma")
endif() endif()
target_sources(mbedcrypto PRIVATE "${COMPONENT_DIR}/port/esp_hardware.c" if(NOT ${IDF_TARGET} STREQUAL "linux")
"${COMPONENT_DIR}/port/esp_mem.c" target_sources(mbedcrypto PRIVATE "${COMPONENT_DIR}/port/esp_hardware.c")
endif()
target_sources(mbedcrypto PRIVATE "${COMPONENT_DIR}/port/esp_mem.c"
"${COMPONENT_DIR}/port/esp_timing.c" "${COMPONENT_DIR}/port/esp_timing.c"
) )

4
components/mbedtls/port/include/mbedtls/esp_config.h
View File

@@ -232,6 +232,7 @@
#undef MBEDTLS_ECP_VERIFY_ALT_SOFT_FALLBACK #undef MBEDTLS_ECP_VERIFY_ALT_SOFT_FALLBACK
#endif #endif
#ifndef CONFIG_IDF_TARGET_LINUX
/** /**
* \def MBEDTLS_ENTROPY_HARDWARE_ALT * \def MBEDTLS_ENTROPY_HARDWARE_ALT
* *
@@ -244,6 +245,7 @@
* Uncomment to use your own hardware entropy collector. * Uncomment to use your own hardware entropy collector.
*/ */
#define MBEDTLS_ENTROPY_HARDWARE_ALT #define MBEDTLS_ENTROPY_HARDWARE_ALT
#endif // !CONFIG_IDF_TARGET_LINUX
/** /**
* \def MBEDTLS_AES_ROM_TABLES * \def MBEDTLS_AES_ROM_TABLES
@@ -866,6 +868,7 @@
*/ */
#define MBEDTLS_FS_IO #define MBEDTLS_FS_IO
#ifndef CONFIG_IDF_TARGET_LINUX
/** /**
* \def MBEDTLS_NO_PLATFORM_ENTROPY * \def MBEDTLS_NO_PLATFORM_ENTROPY
* *
@@ -876,6 +879,7 @@
* Uncomment this macro to disable the built-in platform entropy functions. * Uncomment this macro to disable the built-in platform entropy functions.
*/ */
#define MBEDTLS_NO_PLATFORM_ENTROPY #define MBEDTLS_NO_PLATFORM_ENTROPY
#endif // !CONFIG_IDF_TARGET_LINUX
/** /**
* \def MBEDTLS_PK_RSA_ALT_SUPPORT * \def MBEDTLS_PK_RSA_ALT_SUPPORT