Upodate mbedtls only when necessary.
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
parent
2d72a157d5
commit
c1cc33fd9d
1 changed files with 55 additions and 32 deletions
|
|
@ -109,6 +109,8 @@ endif()
|
||||||
message(STATUS "USB VID/PID:\t\t\t ${USB_VID}:${USB_PID}")
|
message(STATUS "USB VID/PID:\t\t\t ${USB_VID}:${USB_PID}")
|
||||||
|
|
||||||
if(NOT ESP_PLATFORM)
|
if(NOT ESP_PLATFORM)
|
||||||
|
set(NEED_UPDATE OFF)
|
||||||
|
|
||||||
option(ENABLE_EDDSA "Enable/disable EdDSA support" OFF)
|
option(ENABLE_EDDSA "Enable/disable EdDSA support" OFF)
|
||||||
if(ENABLE_EDDSA)
|
if(ENABLE_EDDSA)
|
||||||
message(STATUS "EdDSA support:\t\t enabled")
|
message(STATUS "EdDSA support:\t\t enabled")
|
||||||
|
|
@ -117,49 +119,69 @@ if(NOT ESP_PLATFORM)
|
||||||
endif(ENABLE_EDDSA)
|
endif(ENABLE_EDDSA)
|
||||||
|
|
||||||
set(MBEDTLS_PATH "${CMAKE_SOURCE_DIR}/pico-keys-sdk/mbedtls")
|
set(MBEDTLS_PATH "${CMAKE_SOURCE_DIR}/pico-keys-sdk/mbedtls")
|
||||||
|
|
||||||
if(ENABLE_EDDSA)
|
|
||||||
set(MBEDTLS_ORIGIN "https://github.com/polhenarejos/mbedtls.git")
|
|
||||||
set(MBEDTLS_REF "mbedtls-3.6-eddsa")
|
|
||||||
add_definitions(-DMBEDTLS_ECP_DP_ED25519_ENABLED=1 -DMBEDTLS_ECP_DP_ED448_ENABLED=1 -DMBEDTLS_EDDSA_C=1 -DMBEDTLS_SHA3_C=1)
|
|
||||||
else()
|
|
||||||
set(MBEDTLS_ORIGIN "https://github.com/Mbed-TLS/mbedtls.git")
|
|
||||||
set(MBEDTLS_REF "v3.6.5")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
execute_process(
|
execute_process(
|
||||||
COMMAND git config --global --add safe.directory ${MBEDTLS_PATH}
|
COMMAND git config --global --add safe.directory ${MBEDTLS_PATH}
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
OUTPUT_QUIET ERROR_QUIET
|
OUTPUT_QUIET ERROR_QUIET
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if(ENABLE_EDDSA)
|
||||||
|
set(MBEDTLS_ORIGIN "https://github.com/polhenarejos/mbedtls.git")
|
||||||
|
set(MBEDTLS_REF "mbedtls-3.6-eddsa")
|
||||||
|
|
||||||
execute_process(
|
execute_process(
|
||||||
COMMAND git -C ${MBEDTLS_PATH} submodule update --init --recursive pico-keys-sdk
|
COMMAND git -C ${MBEDTLS_PATH} symbolic-ref --quiet --short HEAD
|
||||||
|
OUTPUT_VARIABLE CURRENT_BRANCH
|
||||||
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
|
RESULT_VARIABLE BRANCH_ERR
|
||||||
|
)
|
||||||
|
|
||||||
|
message(STATUS "Current branch for mbedTLS: ${CURRENT_BRANCH}")
|
||||||
|
message(STATUS "Target branch for mbedTLS: ${MBEDTLS_REF}")
|
||||||
|
|
||||||
|
if(NOT BRANCH_ERR EQUAL 0 OR NOT "${CURRENT_BRANCH}" STREQUAL "${MBEDTLS_REF}")
|
||||||
|
set(NEED_UPDATE ON)
|
||||||
|
else()
|
||||||
|
set(NEED_UPDATE OFF)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_definitions(-DMBEDTLS_ECP_DP_ED25519_ENABLED=1 -DMBEDTLS_ECP_DP_ED448_ENABLED=1 -DMBEDTLS_EDDSA_C=1 -DMBEDTLS_SHA3_C=1)
|
||||||
|
|
||||||
|
else()
|
||||||
|
set(MBEDTLS_ORIGIN "https://github.com/Mbed-TLS/mbedtls.git")
|
||||||
|
set(MBEDTLS_REF "v3.6.5")
|
||||||
|
|
||||||
|
execute_process(
|
||||||
|
COMMAND git -C ${MBEDTLS_PATH} describe --tags --exact-match
|
||||||
|
OUTPUT_VARIABLE CURRENT_TAG
|
||||||
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
|
RESULT_VARIABLE TAG_ERR
|
||||||
|
)
|
||||||
|
|
||||||
|
message(STATUS "Current tag for mbedTLS: ${CURRENT_TAG}")
|
||||||
|
message(STATUS "Target tag for mbedTLS: ${MBEDTLS_REF}")
|
||||||
|
|
||||||
|
if(NOT TAG_ERR EQUAL 0 OR NOT "${CURRENT_TAG}" STREQUAL "${MBEDTLS_REF}")
|
||||||
|
set(NEED_UPDATE ON)
|
||||||
|
else()
|
||||||
|
set(NEED_UPDATE OFF)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(NEED_UPDATE)
|
||||||
|
message(STATUS "Updating mbedTLS source code...")
|
||||||
|
|
||||||
|
execute_process(
|
||||||
|
COMMAND git -C ${MBEDTLS_PATH} submodule update --init --recursive --remote pico-keys-sdk
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
OUTPUT_QUIET ERROR_QUIET
|
OUTPUT_QUIET ERROR_QUIET
|
||||||
)
|
)
|
||||||
|
|
||||||
execute_process(
|
|
||||||
COMMAND git -C ${MBEDTLS_PATH} remote get-url origin
|
|
||||||
OUTPUT_VARIABLE CURRENT_ORIGIN
|
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
|
||||||
)
|
|
||||||
|
|
||||||
if(NOT "${CURRENT_ORIGIN}" STREQUAL "${MBEDTLS_ORIGIN}")
|
|
||||||
execute_process(
|
execute_process(
|
||||||
COMMAND git -C ${MBEDTLS_PATH} remote set-url origin ${MBEDTLS_ORIGIN}
|
COMMAND git -C ${MBEDTLS_PATH} remote set-url origin ${MBEDTLS_ORIGIN}
|
||||||
OUTPUT_QUIET ERROR_QUIET
|
OUTPUT_QUIET ERROR_QUIET
|
||||||
)
|
)
|
||||||
endif()
|
|
||||||
|
|
||||||
execute_process(
|
|
||||||
COMMAND git -C ${MBEDTLS_PATH} rev-parse --verify ${MBEDTLS_REF}
|
|
||||||
OUTPUT_VARIABLE CURRENT_REF
|
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
|
||||||
RESULT_VARIABLE REF_EXISTS
|
|
||||||
)
|
|
||||||
|
|
||||||
if(NOT REF_EXISTS EQUAL 0 OR NOT CURRENT_REF STREQUAL "${MBEDTLS_REF}")
|
|
||||||
|
|
||||||
execute_process(
|
execute_process(
|
||||||
COMMAND git -C ${MBEDTLS_PATH} fetch origin +refs/heads/*:refs/remotes/origin/* --tags --force
|
COMMAND git -C ${MBEDTLS_PATH} fetch origin +refs/heads/*:refs/remotes/origin/* --tags --force
|
||||||
|
|
@ -186,8 +208,9 @@ if(NOT ESP_PLATFORM)
|
||||||
OUTPUT_QUIET ERROR_QUIET
|
OUTPUT_QUIET ERROR_QUIET
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
else()
|
||||||
|
message(STATUS "mbedTLS source code is up to date.")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
endif(NOT ESP_PLATFORM)
|
endif(NOT ESP_PLATFORM)
|
||||||
|
|
||||||
set(MBEDTLS_SOURCES
|
set(MBEDTLS_SOURCES
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue