mirrors/pico-hsm
1
0
Fork 0
mirror of https://github.com/polhenarejos/pico-hsm.git synced 2026-04-17 21:58:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into development

Browse source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>

# Conflicts:
#	CMakeLists.txt
#	pico-keys-sdk
This commit is contained in:
Pol Henarejos 2026-03-07 17:25:11 +01:00
commit 553eecf496
No known key found for this signature in database
GPG key ID: C0095B7870A4CCD3
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -39,7 +39,7 @@ else()
set(__FOR_CI 0) set(__FOR_CI 0)
endif() endif()
if(__FOR_CI) if(__FOR_CI)
add_definitions(-D__FOR_CI) add_compile_definitions(__FOR_CI)
endif() endif()
add_executable(pico_hsm) add_executable(pico_hsm)
@ -84,7 +84,7 @@ set(SOURCES ${SOURCES}
${CMAKE_CURRENT_LIST_DIR}/src/hsm/kek.c ${CMAKE_CURRENT_LIST_DIR}/src/hsm/kek.c
) )
SET_VERSION(ver_major ver_minor "${CMAKE_CURRENT_LIST_DIR}/src/hsm/version.h" 3) SET_VERSION(ver_major ver_minor "${CMAKE_CURRENT_LIST_DIR}/src/hsm/version.h")
if(ESP_PLATFORM) if(ESP_PLATFORM)
project(pico_hsm) project(pico_hsm)
@ -128,7 +128,11 @@ if(NOT ESP_PLATFORM)
-Wl,--gc-sections -Wl,--gc-sections
) )
endif(APPLE) endif(APPLE)
target_link_libraries(pico_hsm PRIVATE pico_keys_sdk pthread m) set(PICO_HSM_EMU_LIBS pico_keys_sdk pthread m)
if(NOT SKIP_MBEDTLS_FOR_OPENSSL_EMULATION)
list(APPEND PICO_HSM_EMU_LIBS mbedtls)
endif()
target_link_libraries(pico_hsm PRIVATE ${PICO_HSM_EMU_LIBS})
else() else()
pico_add_extra_outputs(${CMAKE_PROJECT_NAME}) pico_add_extra_outputs(${CMAKE_PROJECT_NAME})
endif() endif()

2
pico-keys-sdk

@ -1 +1 @@
Subproject commit 4c88d712b403909b146bda78cd61b7111b59ff84 Subproject commit ba1046c172f9c4d5b5f7fcbad4085cff7c4606e3