Update LoRaMac-node to Version 4.4.4,fix Security breach found by Tencent Blade Team please refer to security advisory - CVE-2020-11068

fix Security breach found by Tencent Blade Team please refer to security advisory - CVE-2020-11068
This commit is contained in:
supowang
2020-05-29 11:59:05 +08:00
parent 5d9895cecc
commit f9bd2588a2
137 changed files with 10401 additions and 4328 deletions

View File

@@ -22,17 +22,62 @@ cmake_minimum_required(VERSION 3.6)
# Target
#---------------------------------------------------------------------------------------
file(GLOB ${PROJECT_NAME}_SOURCES "*.c"
"soft-se/*.c")
if(${SECURE_ELEMENT} MATCHES SOFT_SE)
file(GLOB ${PROJECT_NAME}_SOURCES "*.c" "soft-se/*.c")
else()
if(${SECURE_ELEMENT} MATCHES LR1110_SE)
if (${RADIO} MATCHES lr1110)
file(GLOB ${PROJECT_NAME}_SOURCES "*.c" "lr1110-se/*.c")
else()
message(FATAL_ERROR "LR1110_SE secure elemeent can only be used when LR1110 radio is selected.")
endif()
elseif((${SECURE_ELEMENT} MATCHES ATECC608A_TNGLORA_SE))
file(GLOB ${PROJECT_NAME}_SOURCES "*.c"
"atecc608a-tnglora-se/*.c"
"atecc608a-tnglora-se/cryptoauthlib/lib/*.c"
"atecc608a-tnglora-se/cryptoauthlib/lib/basic/*.c"
"atecc608a-tnglora-se/cryptoauthlib/lib/crypto/*.c"
"atecc608a-tnglora-se/cryptoauthlib/lib/crypto/hashes/*.c"
"atecc608a-tnglora-se/cryptoauthlib/lib/hal/atca_hal.c"
"atecc608a-tnglora-se/cryptoauthlib/lib/host/*.c"
)
else()
message(FATAL_ERROR "No secure-element selected.")
endif()
endif()
add_library(${PROJECT_NAME} OBJECT EXCLUDE_FROM_ALL ${${PROJECT_NAME}_SOURCES})
if(${SECURE_ELEMENT_PRE_PROVISIONED} MATCHES ON)
target_compile_definitions(${PROJECT_NAME} PRIVATE -DSECURE_ELEMENT_PRE_PROVISIONED)
endif()
if(${SECURE_ELEMENT} MATCHES SOFT_SE)
target_include_directories( ${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/soft-se)
else()
if(${SECURE_ELEMENT} MATCHES LR1110_SE)
if(${RADIO} MATCHES lr1110)
target_include_directories( ${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/lr1110-se)
endif()
elseif((${SECURE_ELEMENT} MATCHES ATECC608A_TNGLORA_SE))
target_include_directories( ${PROJECT_NAME} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/atecc608a-tnglora-se
${CMAKE_CURRENT_SOURCE_DIR}/atecc608a-tnglora-se/cryptoauthlib/lib
${CMAKE_CURRENT_SOURCE_DIR}/atecc608a-tnglora-se/cryptoauthlib/lib/basic
${CMAKE_CURRENT_SOURCE_DIR}/atecc608a-tnglora-se/cryptoauthlib/lib/crypto
${CMAKE_CURRENT_SOURCE_DIR}/atecc608a-tnglora-se/cryptoauthlib/lib/crypto/hashes
${CMAKE_CURRENT_SOURCE_DIR}/atecc608a-tnglora-se/cryptoauthlib/lib/hal
${CMAKE_CURRENT_SOURCE_DIR}/atecc608a-tnglora-se/cryptoauthlib/lib/host
)
endif()
endif()
target_include_directories( ${PROJECT_NAME} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/soft-se
$<TARGET_PROPERTY:board,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:system,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:mac,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:radio,INTERFACE_INCLUDE_DIRECTORIES>
)
set_property(TARGET ${PROJECT_NAME} PROPERTY C_STANDARD 11)