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

Adding CTAP2 commands.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2022-09-08 17:49:56 +02:00
parent 867d4637ee
commit 7aeac46eef
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/usb/hid/ctap_hid.h
View File

@@ -84,16 +84,25 @@ typedef struct {
#define CTAPHID_LOCK (TYPE_INIT | 0x04) // Send lock channel command #define CTAPHID_LOCK (TYPE_INIT | 0x04) // Send lock channel command
#define CTAPHID_INIT (TYPE_INIT | 0x06) // Channel initialization #define CTAPHID_INIT (TYPE_INIT | 0x06) // Channel initialization
#define CTAPHID_WINK (TYPE_INIT | 0x08) // Send device identification wink #define CTAPHID_WINK (TYPE_INIT | 0x08) // Send device identification wink
#define CTAPHID_SYNC (TYPE_INIT | 0x3c) // Protocol resync command #define CTAPHID_CBOR (TYPE_INIT | 0x10) // CBOR
#define CTAPHID_ERROR (TYPE_INIT | 0x3f) // Error response #define CTAPHID_CANCEL (TYPE_INIT | 0x11) // Cancel any request
#define CTAPHID_KEEPALIVE (TYPE_INIT | 0x3B) // Keepalive command
#define CTAPHID_SYNC (TYPE_INIT | 0x3C) // Protocol resync command
#define CTAPHID_ERROR (TYPE_INIT | 0x3F) // Error response
#define CTAPHID_VENDOR_FIRST (TYPE_INIT | 0x40) // First vendor defined command #define CTAPHID_VENDOR_FIRST (TYPE_INIT | 0x40) // First vendor defined command
#define CTAPHID_VENDOR_LAST (TYPE_INIT | 0x7f) // Last vendor defined command #define CTAPHID_VENDOR_LAST (TYPE_INIT | 0x7F) // Last vendor defined command
// CTAP_KEEPALIVE command defines
#define KEEPALIVE_STATUS_PROCESSING 0x1
#define KEEPALIVE_STATUS_UPNEEDED 0x2
// CTAPHID_INIT command defines // CTAPHID_INIT command defines
#define INIT_NONCE_SIZE 8 // Size of channel initialization challenge #define INIT_NONCE_SIZE 8 // Size of channel initialization challenge
#define CAPFLAG_WINK 0x01 // Device supports WINK command #define CAPFLAG_WINK 0x01 // Device supports WINK command
#define CAPFLAG_CBOR 0x04 // Device supports CBOR command
typedef struct { typedef struct {
uint8_t nonce[INIT_NONCE_SIZE]; // Client application nonce uint8_t nonce[INIT_NONCE_SIZE]; // Client application nonce
@@ -129,7 +138,7 @@ typedef struct {
#define ERR_MSG_TIMEOUT 0x05 // Message has timed out #define ERR_MSG_TIMEOUT 0x05 // Message has timed out
#define ERR_CHANNEL_BUSY 0x06 // Channel busy #define ERR_CHANNEL_BUSY 0x06 // Channel busy
#define ERR_LOCK_REQUIRED 0x0a // Command requires channel lock #define ERR_LOCK_REQUIRED 0x0a // Command requires channel lock
#define ERR_SYNC_FAIL 0x0b // SYNC command failed #define ERR_INVALID_CHANNEL 0x0b // CID not valid
#define ERR_OTHER 0x7f // Other unspecified error #define ERR_OTHER 0x7f // Other unspecified error
#ifdef __cplusplus #ifdef __cplusplus

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

@@ -149,7 +149,7 @@ int driver_process_usb_packet(uint16_t read) {
DEBUG_PAYLOAD(usb_get_rx(),64); DEBUG_PAYLOAD(usb_get_rx(),64);
memset(ctap_resp, 0, sizeof(CTAPHID_FRAME)); memset(ctap_resp, 0, sizeof(CTAPHID_FRAME));
if (ctap_req->cid == 0x0 || (ctap_req->cid == CID_BROADCAST && ctap_req->init.cmd != CTAPHID_INIT)) if (ctap_req->cid == 0x0 || (ctap_req->cid == CID_BROADCAST && ctap_req->init.cmd != CTAPHID_INIT))
return ctap_error(ERR_SYNC_FAIL); return ctap_error(ERR_INVALID_CHANNEL);
if (board_millis() < lock && ctap_req->cid != last_req.cid) if (board_millis() < lock && ctap_req->cid != last_req.cid)
return ctap_error(ERR_CHANNEL_BUSY); return ctap_error(ERR_CHANNEL_BUSY);
if (FRAME_TYPE(ctap_req) == TYPE_INIT) if (FRAME_TYPE(ctap_req) == TYPE_INIT)