Skip to content

Commit

Permalink
Update Mbed TLS to latest supported version
Browse files Browse the repository at this point in the history
This version is some patch levels newer than the one used by upstream.
This version does not require fixing its usage requirements.
  • Loading branch information
sodevel committed Jan 13, 2023
1 parent bf66eca commit 0b02331
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions lib60870-C/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ project(lib60870-C VERSION 2.3.1 LANGUAGES C

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/third_party/cmake/modules")

set(dependencyMbedtlsPath "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/mbedtls-2.16.12")
set(dependencyMbedtlsPath "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/mbedtls-2.28.2")

include(CMakeDependentOption)
option(LIB60870_BUILD_HAL "Build the platform abstraction layer (HAL)" ON)
Expand Down Expand Up @@ -34,15 +34,11 @@ if(LIB60870_WITH_MBEDTLS)
include(FetchContent)
FetchContent_Declare(mbedtls-extern
GIT_REPOSITORY https://github.com/Mbed-TLS/mbedtls.git
GIT_TAG cf4667126010c665341f9e50ef691b7ef8294188
GIT_TAG 89f040a5c938985c5f30728baed21e49d0846a53
)
FetchContent_MakeAvailable(mbedtls-extern)
FetchContent_GetProperties(mbedtls-extern SOURCE_DIR dependencyMbedtlsPath)
endif()
# TODO: The currently used mbedtls version does not carry this usage requirement
foreach(mbedlib IN ITEMS mbedtls mbedx509 mbedcrypto)
target_include_directories(${mbedlib} INTERFACE "$<BUILD_INTERFACE:${dependencyMbedtlsPath}/include>")
endforeach()
endif()

add_subdirectory(src)
Expand Down

0 comments on commit 0b02331

Please sign in to comment.