From ce9ef47bb270d6609cdbe475cfe151701aa8dd7b Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Wed, 31 Aug 2022 14:18:37 +0200 Subject: [PATCH] Using pico_hsm_sdk cmake library. Signed-off-by: Pol Henarejos --- CMakeLists.txt | 62 ++++---------------------------------------------- pico-hsm-sdk | 2 +- 2 files changed, 5 insertions(+), 59 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d2830e..7500674 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,72 +28,18 @@ pico_sdk_init() add_executable(pico_openpgp) -if (NOT DEFINED USB_VID) - set(USB_VID 0xFEFF) -endif() -add_definitions(-DUSB_VID=${USB_VID}) -if (NOT DEFINED USB_PID) - set(USB_PID 0xFCFD) -endif() -add_definitions(-DUSB_PID=${USB_PID}) -if (NOT DEFINED DEBUG_APDU) - set(DEBUG_APDU 0) -endif() -add_definitions(-DDEBUG_APDU=${DEBUG_APDU}) - -configure_file(${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/config/mbedtls_config.h ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/include/mbedtls COPYONLY) - target_sources(pico_openpgp PUBLIC - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src/usb/usb.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src/usb/ccid/usb_descriptors.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src/usb/ccid/ccid.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src/main.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src/asn1.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src/fs/file.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src/fs/flash.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src/fs/low_flash.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src/rng/random.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src/rng/hwrng.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src/crypto_utils.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src/eac.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src/apdu.c ${CMAKE_CURRENT_LIST_DIR}/src/openpgp/openpgp.c ${CMAKE_CURRENT_LIST_DIR}/src/openpgp/files.c - - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/aes.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/asn1parse.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/bignum.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/cmac.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/cipher.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/cipher_wrap.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/constant_time.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/ecdsa.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/ecdh.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/ecp.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/ecp_curves.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/md.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/md5.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/oid.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/platform_util.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/ripemd160.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/rsa.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/rsa_alt_helpers.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/sha1.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/sha256.c - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library/sha512.c ) target_include_directories(pico_openpgp PUBLIC - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src/fs ${CMAKE_CURRENT_LIST_DIR}/src/openpgp - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src/usb/ccid - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src/rng - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src/usb - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/src - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/include - ${CMAKE_CURRENT_LIST_DIR}/pico-hsm-sdk/mbedtls/library ) +set(HSM_DRIVER "ccid") +include(pico-hsm-sdk/pico_hsm_sdk_import.cmake) + target_compile_options(pico_openpgp PUBLIC -Wall -Werror @@ -103,4 +49,4 @@ pico_add_extra_outputs(pico_openpgp) #target_compile_definitions(pico_openpgp PRIVATE MBEDTLS_ECDSA_DETERMINISTIC=1) -target_link_libraries(pico_openpgp PRIVATE pico_stdlib tinyusb_device tinyusb_board pico_multicore hardware_flash hardware_sync hardware_adc pico_unique_id hardware_rtc) +target_link_libraries(pico_openpgp PRIVATE pico_hsm_sdk pico_stdlib tinyusb_device tinyusb_board pico_multicore hardware_flash hardware_sync hardware_adc pico_unique_id hardware_rtc) diff --git a/pico-hsm-sdk b/pico-hsm-sdk index 8075352..1d2a461 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit 8075352fab11924038c77038ded5f9967608b8c8 +Subproject commit 1d2a461086526b5f8a0ba08fe111aea10e87f12a