webadmin/pico-keys-sdk
1
0
Fork 0
mirror of https://github.com/polhenarejos/pico-keys-sdk synced 2026-06-11 04:48:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into esp32

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2024-05-31 17:12:12 +02:00
parent af20b4f894 e4e43dae04
commit 9a607707f0
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pico_keys_sdk_import.cmake
View File

@@ -137,6 +137,12 @@ set(MBEDTLS_SOURCES
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/poly1305.c ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/poly1305.c
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/ripemd160.c ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/ripemd160.c
${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/des.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} set(SOURCES ${SOURCES}

1
src/pico_keys.h
View File

@@ -73,6 +73,7 @@ static inline void put_uint16_t(uint16_t n, uint8_t *b) {
} }
extern void low_flash_available(); extern void low_flash_available();
extern int flash_clear_file(file_t *file);
extern void timeout_stop(); extern void timeout_stop();
extern void timeout_start(); extern void timeout_start();

5
src/usb/hid/hid.c
View File

@@ -429,11 +429,6 @@ int driver_process_usb_packet_hid(uint16_t read) {
memset(ctap_resp, 0, 64); memset(ctap_resp, 0, 64);
ctap_resp->cid = ctap_req->cid; ctap_resp->cid = ctap_req->cid;
ctap_resp->init.cmd = ctap_req->init.cmd; 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)); memcpy(ctap_resp->init.data, pico_serial.id, sizeof(pico_serial.id));
ctap_resp->init.bcntl = 16; ctap_resp->init.bcntl = 16;
hid_write(64); hid_write(64);