From 88071e117222bbc3ab018bc45f6d691a4fcf78f3 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Sun, 5 May 2024 00:56:51 +0200 Subject: [PATCH 1/2] Some fixes. Signed-off-by: Pol Henarejos --- src/pico_keys.h | 1 + src/usb/hid/hid.c | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/pico_keys.h b/src/pico_keys.h index 0fc6b0d..ffe3b8a 100644 --- a/src/pico_keys.h +++ b/src/pico_keys.h @@ -63,6 +63,7 @@ static inline void put_uint16_t(uint16_t n, uint8_t *b) { } extern void low_flash_available(); +extern int flash_clear_file(file_t *file); extern void timeout_stop(); extern void timeout_start(); diff --git a/src/usb/hid/hid.c b/src/usb/hid/hid.c index 80ea2d2..738c658 100644 --- a/src/usb/hid/hid.c +++ b/src/usb/hid/hid.c @@ -427,11 +427,6 @@ int driver_process_usb_packet_hid(uint16_t read) { memset(ctap_resp, 0, 64); ctap_resp->cid = ctap_req->cid; ctap_resp->init.cmd = ctap_req->init.cmd; -#ifdef ENABLE_EMULATION - struct { - uint8_t id[8]; - } rpiid = { 0 }; -#endif memcpy(ctap_resp->init.data, pico_serial.id, sizeof(pico_serial.id)); ctap_resp->init.bcntl = 16; hid_write(64); From e4e43dae04d093286bd532d7486b24e8237b4960 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 23 May 2024 18:40:01 +0200 Subject: [PATCH 2/2] Build x509 suite always if necessary. Signed-off-by: Pol Henarejos --- pico_keys_sdk_import.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pico_keys_sdk_import.cmake b/pico_keys_sdk_import.cmake index b3ec23d..7a1964e 100644 --- a/pico_keys_sdk_import.cmake +++ b/pico_keys_sdk_import.cmake @@ -120,6 +120,12 @@ set(EXTERNAL_SOURCES ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/poly1305.c ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/ripemd160.c ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/des.c + ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/x509write_crt.c + ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/x509_create.c + ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/x509write_csr.c + ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/pk.c + ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/pk_wrap.c + ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/pkwrite.c ) set(SOURCES ${SOURCES} @@ -154,12 +160,6 @@ set(INCLUDES ${INCLUDES} if(USB_ITF_HID OR ENABLE_EMULATION) set(EXTERNAL_SOURCES ${EXTERNAL_SOURCES} - ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/x509write_crt.c - ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/x509_create.c - ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/x509write_csr.c - ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/pk.c - ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/pk_wrap.c - ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/pkwrite.c ${CMAKE_CURRENT_LIST_DIR}/tinycbor/src/cborencoder.c ${CMAKE_CURRENT_LIST_DIR}/tinycbor/src/cborparser.c ${CMAKE_CURRENT_LIST_DIR}/tinycbor/src/cborparser_dup_string.c