Skip to content

Commit cfe229c

Browse files
xuxin930xiaoxiang781216
authored andcommitted
cmake:bugfix fix mbedtls missing source and depend issue
Signed-off-by: xuxin19 <[email protected]>
1 parent d4becc8 commit cfe229c

File tree

1 file changed

+39
-4
lines changed

1 file changed

+39
-4
lines changed

crypto/mbedtls/CMakeLists.txt

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ if(CONFIG_CRYPTO_MBEDTLS)
3333
URL ${MBEDTLS_URL}/v${CONFIG_MBEDTLS_VERSION}.zip SOURCE_DIR
3434
${CMAKE_CURRENT_LIST_DIR}/mbedtls BINARY_DIR
3535
${CMAKE_BINARY_DIR}/apps/crypto/mbedtls/mbedtls
36+
PATCH_COMMAND
37+
patch -p1 -d ${MBEDTLS_DIR} <
38+
${CMAKE_CURRENT_LIST_DIR}/0001-mbedtls-entropy_poll-use-getrandom-to-get-the-system.patch
39+
&& patch -p1 -d ${MBEDTLS_DIR} <
40+
${CMAKE_CURRENT_LIST_DIR}/0002-mbedtls-add-mbedtls-x509-crt-pool.patch
3641
DOWNLOAD_NO_PROGRESS true
3742
TIMEOUT 30)
3843

@@ -54,6 +59,8 @@ if(CONFIG_CRYPTO_MBEDTLS)
5459
if(CONFIG_DEBUG_OPTLEVEL STREQUAL -O3)
5560
set_source_files_properties(${MBEDTLS_DIR}/library/sha246.c
5661
PROPERTIES COMPILE_FLAGS -O2)
62+
set_source_files_properties(${MBEDTLS_DIR}/library/cmac.c
63+
PROPERTIES COMPILE_FLAGS -O2)
5764
endif()
5865
endif()
5966

@@ -63,12 +70,36 @@ if(CONFIG_CRYPTO_MBEDTLS)
6370

6471
file(GLOB CSRCS ${MBEDTLS_DIR}/library/*.c)
6572

73+
if(CONFIG_MBEDTLS_ALT)
74+
list(APPEND CSRCS ${CMAKE_CURRENT_LIST_DIR}/source/dev_alt.c)
75+
76+
if(CONFIG_MBEDTLS_AES_ALT)
77+
list(APPEND CSRCS ${CMAKE_CURRENT_LIST_DIR}/source/aes_alt.c)
78+
endif()
79+
80+
if(CONFIG_MBEDTLS_MD5_ALT)
81+
list(APPEND CSRCS ${CMAKE_CURRENT_LIST_DIR}/source/md5_alt.c)
82+
endif()
83+
84+
if(CONFIG_MBEDTLS_SHA1_ALT)
85+
list(APPEND CSRCS ${CMAKE_CURRENT_LIST_DIR}/source/sha1_alt.c)
86+
endif()
87+
88+
if(CONFIG_MBEDTLS_SHA256_ALT)
89+
list(APPEND CSRCS ${CMAKE_CURRENT_LIST_DIR}/source/sha256_alt.c)
90+
endif()
91+
92+
if(CONFIG_MBEDTLS_SHA512_ALT)
93+
list(APPEND CSRCS ${CMAKE_CURRENT_LIST_DIR}/source/sha512_alt.c)
94+
endif()
95+
96+
endif()
97+
6698
# ############################################################################
6799
# Include Directory
68100
# ############################################################################
69101

70-
set(INCDIR ${MBEDTLS_DIR}/include)
71-
102+
set(INCDIR ${CMAKE_CURRENT_LIST_DIR}/include ${MBEDTLS_DIR}/include)
72103
# ############################################################################
73104
# Library Configuration
74105
# ############################################################################
@@ -77,6 +108,10 @@ if(CONFIG_CRYPTO_MBEDTLS)
77108
TARGET nuttx
78109
APPEND
79110
PROPERTY NUTTX_INCLUDE_DIRECTORIES ${INCDIR})
111+
set_property(
112+
TARGET nuttx
113+
APPEND
114+
PROPERTY NUTTX_CXX_INCLUDE_DIRECTORIES ${INCDIR})
80115

81116
nuttx_add_library(mbedtls STATIC)
82117
target_sources(mbedtls PRIVATE ${CSRCS})
@@ -108,7 +143,7 @@ if(CONFIG_CRYPTO_MBEDTLS)
108143
INCLUDE_DIRECTORIES
109144
${INCDIR}
110145
DEPENDS
111-
mbedtls_nuttx)
146+
mbedtls)
112147
endif()
113148

114149
if(CONFIG_MBEDTLS_APP_SELFTEST)
@@ -126,7 +161,7 @@ if(CONFIG_CRYPTO_MBEDTLS)
126161
INCLUDE_DIRECTORIES
127162
${INCDIR}
128163
DEPENDS
129-
mbedtls_nuttx)
164+
mbedtls)
130165
endif()
131166

132167
endif()

0 commit comments

Comments
 (0)