From 545860ccbccf78b2521949e256aab49dc22380ed Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Tue, 20 Dec 2022 23:42:06 +0100 Subject: [PATCH] Update some functions to the newer Pico HSM SDK. Signed-off-by: Pol Henarejos --- CMakeLists.txt | 2 ++ pico-fido-patch-vidpid.sh | 4 ++-- pico-hsm-sdk | 2 +- src/fido/cbor.c | 3 +-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 764ec7f..39cdbe3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,8 @@ target_sources(pico_fido PUBLIC ${CMAKE_CURRENT_LIST_DIR}/src/fido/cbor_large_blobs.c ) set(HSM_DRIVER "hid") +set(USB_ITF_HID 1) +set(USB_ITF_CCID 1) include(pico-hsm-sdk/pico_hsm_sdk_import.cmake) target_include_directories(pico_fido PUBLIC diff --git a/pico-fido-patch-vidpid.sh b/pico-fido-patch-vidpid.sh index ff77dd8..7715a60 100755 --- a/pico-fido-patch-vidpid.sh +++ b/pico-fido-patch-vidpid.sh @@ -17,8 +17,8 @@ # along with this program. If not, see . # -VERSION_MAJOR="3" #Version of Pico CCID Core -VERSION_MINOR="4" +VERSION_MAJOR="4" #Version of Pico CCID Core +VERSION_MINOR="0" echo "----------------------------" echo "VID/PID patcher for Pico FIDO" diff --git a/pico-hsm-sdk b/pico-hsm-sdk index fa54da9..e5825df 160000 --- a/pico-hsm-sdk +++ b/pico-hsm-sdk @@ -1 +1 @@ -Subproject commit fa54da973caa6ca2f861cf59634d529af8bc5894 +Subproject commit e5825df5cb44ff5854c5d38f3723ffc8c3de766c diff --git a/src/fido/cbor.c b/src/fido/cbor.c index a0562b6..c823f29 100644 --- a/src/fido/cbor.c +++ b/src/fido/cbor.c @@ -49,7 +49,7 @@ int cbor_parse(uint8_t cmd, const uint8_t *data, size_t len) { if (len == 0) return CTAP1_ERR_INVALID_LEN; DEBUG_DATA(data+1,len-1); - driver_prepare_response(); + driver_prepare_response_hid(); if (cmd == CTAPHID_CBOR) { if (data[0] == CTAP_MAKE_CREDENTIAL) return cbor_make_credential(data + 1, len - 1); @@ -89,7 +89,6 @@ void cbor_thread() { break; } - apdu.sw = cbor_parse(cmd, cbor_data, cbor_len); if (apdu.sw == 0) DEBUG_DATA(res_APDU + 1, res_APDU_size);