diff --git a/src/fs/file.c b/src/fs/file.c index 390dc87..6ef34a6 100644 --- a/src/fs/file.c +++ b/src/fs/file.c @@ -427,3 +427,6 @@ int meta_add(uint16_t fid, const uint8_t *data, uint16_t len) { return CCID_OK; } +bool file_has_data(file_t *f) { + return (f != NULL && f->data != NULL && file_get_size(f) > 0); +} diff --git a/src/fs/file.h b/src/fs/file.h index dc37485..3219c80 100644 --- a/src/fs/file.h +++ b/src/fs/file.h @@ -74,6 +74,8 @@ typedef struct file const uint8_t acl[7]; } __attribute__((packed)) file_t; +extern bool file_has_data(file_t *); + extern file_t *currentEF; extern file_t *currentDF; extern const file_t *selected_applet; diff --git a/src/usb/hid/ctap_hid.h b/src/usb/hid/ctap_hid.h index 3a2caf9..a75ac87 100644 --- a/src/usb/hid/ctap_hid.h +++ b/src/usb/hid/ctap_hid.h @@ -139,16 +139,18 @@ typedef struct { // Low-level error codes. Return as negatives. -#define ERR_NONE 0x00 // No error -#define ERR_INVALID_CMD 0x01 // Invalid command -#define ERR_INVALID_PAR 0x02 // Invalid parameter -#define ERR_INVALID_LEN 0x03 // Invalid message length -#define ERR_INVALID_SEQ 0x04 // Invalid message sequencing -#define ERR_MSG_TIMEOUT 0x05 // Message has timed out -#define ERR_CHANNEL_BUSY 0x06 // Channel busy -#define ERR_LOCK_REQUIRED 0x0a // Command requires channel lock -#define ERR_INVALID_CHANNEL 0x0b // CID not valid -#define ERR_OTHER 0x7f // Other unspecified error +#define CTAP_MAX_PACKET_SIZE (64 - 7 + 128 * (64 - 5)) + +#define CTAP1_ERR_NONE 0x00 // No error +#define CTAP1_ERR_INVALID_CMD 0x01 // Invalid command +#define CTAP1_ERR_INVALID_PARAMETER 0x02 // Invalid parameter +#define CTAP1_ERR_INVALID_LEN 0x03 // Invalid message length +#define CTAP1_ERR_INVALID_SEQ 0x04 // Invalid message sequencing +#define CTAP1_ERR_MSG_TIMEOUT 0x05 // Message has timed out +#define CTAP1_ERR_CHANNEL_BUSY 0x06 // Channel busy +#define CTAP1_ERR_LOCK_REQUIRED 0x0a // Command requires channel lock +#define CTAP1_ERR_INVALID_CHANNEL 0x0b // CID not valid +#define CTAP1_ERR_OTHER 0x7f // Other unspecified error #ifdef __cplusplus } diff --git a/src/usb/hid/hid.c b/src/usb/hid/hid.c index 50118a0..f9d293f 100644 --- a/src/usb/hid/hid.c +++ b/src/usb/hid/hid.c @@ -15,8 +15,6 @@ * along with this program. If not, see . */ -#include "common.h" -#include "mbedtls/chachapoly.h" #include "tusb.h" #include "ctap_hid.h" #include "hsm.h" @@ -24,12 +22,9 @@ #include "apdu.h" #include "usb.h" #include "bsp/board.h" -#include "cbor.h" -#include "random.h" - -#define CTAP_MAX_PACKET_SIZE (64 - 7 + 128 * (64 - 5)) static bool mounted = false; +extern int cbor_process(const uint8_t *, size_t); typedef struct msg_packet { uint16_t len; @@ -146,444 +141,6 @@ uint8_t last_seq = 0; CTAPHID_FRAME last_req = { 0 }; uint32_t lock = 0; -const uint8_t aaguid[16] = {0x89, 0xFB, 0x94, 0xB7, 0x06, 0xC9, 0x36, 0x73, 0x9B, 0x7E, 0x30, 0x52, 0x6D, 0x96, 0x81, 0x45}; // First 16 bytes of SHA256("Pico FIDO2") - -#define CBOR_CHECK(f) \ - do \ - { \ - error = f; \ - if (error != CborNoError) \ - { \ - printf("Cannot encode CBOR [%d]: %s\n", __LINE__, #f); \ - goto err; \ - } \ - } while (0) - -#define CBOR_FREE(x) \ - do \ - { \ - if (x) \ - { \ - free(x); \ - x = NULL;\ - } \ - } while(0) - -#define CBOR_ERROR(e) \ - do \ - { \ - error = e; \ - printf("Cbor ERROR [%d]: %d\n", __LINE__, e); \ - goto err; \ - } while(0) - -#define CBOR_ASSERT(c) \ - do \ - { \ - if (!c) \ - { \ - error = CborErrorImproperValue; \ - printf("Cbor ASSERT [%d]: %s\n", __LINE__, #c); \ - goto err; \ - } \ - } while(0) - -typedef struct CborByteString { - uint8_t *val; - size_t val_len; -} CborByteString; - -typedef struct CborCharString { - char *val; - size_t val_len; -} CborCharString; - -#define CBOR_FREE_BYTE_STRING(v) \ - do \ - { \ - CBOR_FREE((v).val); \ - (v).val_len = 0; \ - } while(0) - -typedef struct PublicKeyCredentialEntity -{ - CborCharString name; -} PublicKeyCredentialEntity; - -typedef struct PublicKeyCredentialRpEntity -{ - PublicKeyCredentialEntity parent; - CborCharString id; -} PublicKeyCredentialRpEntity; - -typedef struct PublicKeyCredentialUserEntity -{ - PublicKeyCredentialEntity parent; - CborByteString id; - CborCharString displayName; -} PublicKeyCredentialUserEntity; - -typedef struct PublicKeyCredentialParameters { - CborCharString type; - int64_t alg; -} PublicKeyCredentialParameters; - -typedef struct PublicKeyCredentialDescriptor { - CborCharString type; - CborByteString id; - CborCharString transports[8]; - size_t transports_len; -} PublicKeyCredentialDescriptor; - -typedef struct CredOptions { - bool rk; - bool up; - bool uv; -} CredOptions; - -#define CBOR_PARSE_MAP_START(_p,_n) \ - CBOR_ASSERT(cbor_value_is_map(&(_p)) == true); \ - CborValue _f##_n; \ - CBOR_CHECK(cbor_value_enter_container(&(_p), &(_f##_n))); \ - while (cbor_value_at_end(&(_f##_n)) == false) - -#define CBOR_PARSE_ARRAY_START(_p,_n) \ - CBOR_ASSERT(cbor_value_is_array(&(_p)) == true); \ - CborValue _f##_n; \ - CBOR_CHECK(cbor_value_enter_container(&(_p), &(_f##_n))); \ - while (cbor_value_at_end(&(_f##_n)) == false) - -#define CBOR_FIELD_GET_UINT(v, _n) \ - do { \ - CBOR_ASSERT(cbor_value_is_unsigned_integer(&(_f##_n)) == true); \ - CBOR_CHECK(cbor_value_get_uint64(&(_f##_n), &(v))); \ - CBOR_CHECK(cbor_value_advance_fixed(&(_f##_n))); \ - } while(0) - -#define CBOR_FIELD_GET_INT(v, _n) \ - do { \ - CBOR_ASSERT(cbor_value_is_integer(&(_f##_n)) == true); \ - CBOR_CHECK(cbor_value_get_int64(&(_f##_n), &(v))); \ - CBOR_CHECK(cbor_value_advance_fixed(&(_f##_n))); \ - } while(0) - -#define CBOR_FIELD_GET_BYTES(v, _n) \ - do { \ - CBOR_ASSERT(cbor_value_is_byte_string(&(_f##_n)) == true); \ - CBOR_CHECK(cbor_value_dup_byte_string(&(_f##_n), &(v).val, &(v).val_len, &(_f##_n))); \ - } while (0) - -#define CBOR_FIELD_GET_TEXT(v, _n) \ - do { \ - CBOR_ASSERT(cbor_value_is_text_string(&(_f##_n)) == true); \ - CBOR_CHECK(cbor_value_dup_text_string(&(_f##_n), &(v).val, &(v).val_len, &(_f##_n))); \ - } while (0) - -#define CBOR_FIELD_GET_BOOL(v, _n) \ - do { \ - CBOR_ASSERT(cbor_value_is_boolean(&(_f##_n)) == true); \ - CBOR_CHECK(cbor_value_get_boolean(&(_f##_n), &(v))); \ - CBOR_CHECK(cbor_value_advance_fixed(&(_f##_n))); \ - } while(0) - -#define CBOR_FIELD_GET_KEY_TEXT(_n) \ - CBOR_ASSERT(cbor_value_is_text_string(&(_f##_n)) == true); \ - char _fd##_n[64]; \ - size_t _fdl##_n = sizeof(_fd##_n); \ - CBOR_CHECK(cbor_value_copy_text_string(&(_f##_n), _fd##_n, &_fdl##_n, &(_f##_n))) - -#define CBOR_FIELD_KEY_TEXT_VAL_TEXT(_n, _t, _v) \ - if (strcmp(_fd##_n, _t) == 0) { \ - CBOR_ASSERT(cbor_value_is_text_string(&_f##_n) == true); \ - CBOR_CHECK(cbor_value_dup_text_string(&(_f##_n), &(_v).val, &(_v).val_len, &(_f##_n))); \ - } - -#define CBOR_FIELD_KEY_TEXT_VAL_BYTES(_n, _t, _v) \ - if (strcmp(_fd##_n, _t) == 0) { \ - CBOR_ASSERT(cbor_value_is_byte_string(&_f##_n) == true); \ - CBOR_CHECK(cbor_value_dup_byte_string(&(_f##_n), &(_v).val, &(_v).val_len, &(_f##_n))); \ - } - -#define CBOR_FIELD_KEY_TEXT_VAL_INT(_n, _t, _v) \ - if (strcmp(_fd##_n, _t) == 0) { \ - CBOR_FIELD_GET_INT(_v, _n);\ - } - -#define CBOR_FIELD_KEY_TEXT_VAL_BOOL(_n, _t, _v) \ - if (strcmp(_fd##_n, _t) == 0) { \ - CBOR_FIELD_GET_BOOL(_v, _n);\ - } - -#define CBOR_PARSE_MAP_END(_p,_n) \ - CBOR_CHECK(cbor_value_leave_container(&(_p), &(_f##_n))) - -#define CBOR_PARSE_ARRAY_END(_p,_n) CBOR_PARSE_MAP_END(_p, _n) - -#define CBOR_ADVANCE(_n) CBOR_CHECK(cbor_value_advance(&_f##_n)); - -typedef struct Credential { - CborCharString rp_id; - CborCharString rp_name; - CborByteString rp_id_hash; - CborCharString user_id; - CborCharString user_name; - CborCharString display_name; - uint32_t creation_time; - bool hmac_secret; - bool use_sign_count; - int algorithm; - int curve; - CborByteString id; -} Credential; - -int credential_free(Credential *cred) { - CBOR_FREE_BYTE_STRING(cred->rp_id); - CBOR_FREE_BYTE_STRING(cred->rp_name); - CBOR_FREE_BYTE_STRING(cred->rp_id_hash); - CBOR_FREE_BYTE_STRING(cred->user_id); - CBOR_FREE_BYTE_STRING(cred->user_name); - CBOR_FREE_BYTE_STRING(cred->display_name); - CBOR_FREE_BYTE_STRING(cred->id); - return 0; -} - -#define CBOR_APPEND_KEY_UINT_VAL_TEXT(p, k, v) \ - do { \ - if ((v).val && (v).val_len > 0) { \ - CBOR_CHECK(cbor_encode_uint(&(p), (k))); \ - CBOR_CHECK(cbor_encode_text_stringz(&(p), (v).val)); \ - } } while(0) - -#define CBOR_APPEND_KEY_UINT_VAL_UINT(p, k, v) \ - do { \ - CBOR_CHECK(cbor_encode_uint(&(p), (k))); \ - CBOR_CHECK(cbor_encode_uint(&(p), (v))); \ - } while(0) - -#define CBOR_APPEND_KEY_UINT_VAL_BOOL(p, k, v) \ - do { \ - CBOR_CHECK(cbor_encode_uint(&(p), (k))); \ - CBOR_CHECK(cbor_encode_boolean(&(p), (v))); \ - } while(0) - -int credential_gen(Credential *cred) { - uint8_t key[32], iv[12], cbor_data[256], cipher[256], tag[16]; - mbedtls_chachapoly_context chatx; - memset(key, 0, sizeof(key)); - memcpy(iv, random_bytes_get(12), 12); - mbedtls_chachapoly_init(&chatx); - CborEncoder encoder, mapEncoder; - CborError error = CborNoError; - cbor_encoder_init(&encoder, cbor_data, sizeof(cbor_data), 0); - CBOR_CHECK(cbor_encoder_create_map(&encoder, &mapEncoder, CborIndefiniteLength)); - - CBOR_APPEND_KEY_UINT_VAL_TEXT(mapEncoder, 0x01, cred->rp_id); - CBOR_APPEND_KEY_UINT_VAL_TEXT(mapEncoder, 0x02, cred->rp_name); - CBOR_APPEND_KEY_UINT_VAL_TEXT(mapEncoder, 0x03, cred->user_id); - CBOR_APPEND_KEY_UINT_VAL_TEXT(mapEncoder, 0x04, cred->user_name); - CBOR_APPEND_KEY_UINT_VAL_TEXT(mapEncoder, 0x05, cred->display_name); - CBOR_APPEND_KEY_UINT_VAL_UINT(mapEncoder, 0x06, cred->creation_time); - CBOR_APPEND_KEY_UINT_VAL_BOOL(mapEncoder, 0x07, cred->hmac_secret); - CBOR_APPEND_KEY_UINT_VAL_BOOL(mapEncoder, 0x08, cred->use_sign_count); - - CBOR_CHECK(cbor_encoder_close_container(&encoder, &mapEncoder)); - err: - if (error != CborNoError) - return -ERR_INVALID_PAR; - size_t rs = cbor_encoder_get_buffer_size(&encoder, cbor_data); - int ret = mbedtls_chachapoly_encrypt_and_tag(&chatx, rs, iv, cred->rp_id_hash.val, cred->rp_id_hash.val_len, cbor_data, cipher, tag); - mbedtls_chachapoly_free(&chatx); - if (ret != 0) - return -ERR_OTHER; - cred->id.val_len = 4 + 12 + rs + 16; - cred->id.val = (uint8_t *)calloc(1, cred->id.val_len); - memcpy(cred->id.val, "\xf1\xd0\x02\x00", 4); - memcpy(cred->id.val + 4, iv, 12); - memcpy(cred->id.val + 4 + 12, cipher, rs); - memcpy(cred->id.val + 4 + 12 + rs, tag, 16); - return 0; -} - -int cbor_make_credential(const uint8_t *data, size_t len) { - CborParser parser; - CborValue map; - CborError error = CborNoError; - CborByteString clientDataHash = {0}, pinUvAuthParam = {0}; - PublicKeyCredentialRpEntity rp = {0}; - PublicKeyCredentialUserEntity user = {0}; - PublicKeyCredentialParameters pubKeyCredParams[16] = {0}; - size_t pubKeyCredParams_len = 0; - PublicKeyCredentialDescriptor excludeList = {0}; - CredOptions options = {0}; - uint64_t pinUvAuthProtocol = 0, enterpriseAttestation = 0; - - CBOR_CHECK(cbor_parser_init(data, len, 0, &parser, &map)); - CBOR_PARSE_MAP_START(map, 1) { - uint64_t val_u = 0; - CBOR_FIELD_GET_UINT(val_u, 1); - if (val_u == 0x01) { // clientDataHash - CBOR_FIELD_GET_BYTES(clientDataHash, 1); - } - else if (val_u == 0x02) { // rp - CBOR_PARSE_MAP_START(_f1, 2) { - CBOR_FIELD_GET_KEY_TEXT(2); - CBOR_FIELD_KEY_TEXT_VAL_TEXT(2, "id", rp.id); - CBOR_FIELD_KEY_TEXT_VAL_TEXT(2, "name", rp.parent.name); - } - CBOR_PARSE_MAP_END(_f1, 2); - } - else if (val_u == 0x03) { // user - CBOR_PARSE_MAP_START(_f1, 2) { - CBOR_FIELD_GET_KEY_TEXT(2); - CBOR_FIELD_KEY_TEXT_VAL_BYTES(2, "id", user.id); - CBOR_FIELD_KEY_TEXT_VAL_TEXT(2, "name", user.parent.name); - CBOR_FIELD_KEY_TEXT_VAL_TEXT(2, "displayName", user.displayName); - } - CBOR_PARSE_MAP_END(_f1, 2); - } - else if (val_u == 0x04) { // pubKeyCredParams - CBOR_PARSE_ARRAY_START(_f1, 2) { - PublicKeyCredentialParameters *pk = &pubKeyCredParams[pubKeyCredParams_len]; - CBOR_PARSE_MAP_START(_f2, 3) { - CBOR_FIELD_GET_KEY_TEXT(3); - CBOR_FIELD_KEY_TEXT_VAL_TEXT(3, "type", pk->type); - CBOR_FIELD_KEY_TEXT_VAL_INT(3, "alg", pk->alg); - } - CBOR_PARSE_MAP_END(_f2, 3); - pubKeyCredParams_len++; - } - CBOR_PARSE_ARRAY_END(_f1, 2); - } - else if (val_u == 0x05) { // excludeList - CBOR_PARSE_MAP_START(_f1, 2) { - CBOR_FIELD_GET_KEY_TEXT(2); - CBOR_FIELD_KEY_TEXT_VAL_BYTES(2, "id", excludeList.id); - CBOR_FIELD_KEY_TEXT_VAL_TEXT(2, "type", excludeList.type); - if (strcmp(_fd2, "transports") == 0) { - CBOR_PARSE_ARRAY_START(_f2, 3) { - CBOR_FIELD_GET_TEXT(excludeList.transports[excludeList.transports_len], 3); - excludeList.transports_len++; - } - CBOR_PARSE_ARRAY_END(_f2, 3); - } - } - CBOR_PARSE_MAP_END(_f1, 2); - } - else if (val_u == 0x06) { // extensions - CBOR_ADVANCE(1); - } - else if (val_u == 0x07) { // options - CBOR_PARSE_MAP_START(_f1, 2) { - CBOR_FIELD_GET_KEY_TEXT(2); - CBOR_FIELD_KEY_TEXT_VAL_BOOL(2, "rk", options.rk); - CBOR_FIELD_KEY_TEXT_VAL_BOOL(2, "up", options.up); - CBOR_FIELD_KEY_TEXT_VAL_BOOL(2, "uv", options.uv); - } - CBOR_PARSE_MAP_END(_f1, 2); - } - else if (val_u == 0x08) { // pinUvAuthParam - CBOR_FIELD_GET_BYTES(pinUvAuthParam, 1); - } - else if (val_u == 0x09) { // pinUvAuthProtocol - CBOR_FIELD_GET_UINT(pinUvAuthProtocol, 1); - } - else if (val_u == 0x0A) { // enterpriseAttestation - CBOR_FIELD_GET_UINT(enterpriseAttestation, 1); - } - } - CBOR_PARSE_MAP_END(map, 1); - - - -err: - CBOR_FREE_BYTE_STRING(clientDataHash); - CBOR_FREE_BYTE_STRING(pinUvAuthParam); - CBOR_FREE_BYTE_STRING(rp.id); - CBOR_FREE_BYTE_STRING(rp.parent.name); - CBOR_FREE_BYTE_STRING(user.id); - CBOR_FREE_BYTE_STRING(user.displayName); - CBOR_FREE_BYTE_STRING(user.parent.name); - for (int n = 0; n < pubKeyCredParams_len; n++) { - CBOR_FREE_BYTE_STRING(pubKeyCredParams[n].type); - } - - CBOR_FREE_BYTE_STRING(excludeList.type); - CBOR_FREE_BYTE_STRING(excludeList.id); - for (int n = 0; n < excludeList.transports_len; n++) { - CBOR_FREE_BYTE_STRING(excludeList.transports[n]); - } - if (error != CborNoError) - return -ERR_INVALID_PAR; - driver_exec_finished(1); - return 0; - } - -int cbor_get_info() { - CborEncoder encoder, mapEncoder, arrayEncoder; - CborError error = CborNoError; - cbor_encoder_init(&encoder, ctap_resp->init.data + 1, CTAP_MAX_PACKET_SIZE, 0); - CBOR_CHECK(cbor_encoder_create_map(&encoder, &mapEncoder, 7)); - - CBOR_CHECK(cbor_encode_uint(&mapEncoder, 0x01)); - CBOR_CHECK(cbor_encoder_create_array(&mapEncoder, &arrayEncoder, 2)); - CBOR_CHECK(cbor_encode_text_stringz(&arrayEncoder, "U2F_V2")); - CBOR_CHECK(cbor_encode_text_stringz(&arrayEncoder, "FIDO_2_0")); - CBOR_CHECK(cbor_encoder_close_container(&mapEncoder, &arrayEncoder)); - - CBOR_CHECK(cbor_encode_uint(&mapEncoder, 0x02)); - CBOR_CHECK(cbor_encoder_create_array(&mapEncoder, &arrayEncoder, 1)); - CBOR_CHECK(cbor_encode_text_stringz(&arrayEncoder, "hmac-secret")); - CBOR_CHECK(cbor_encoder_close_container(&mapEncoder, &arrayEncoder)); - - CBOR_CHECK(cbor_encode_uint(&mapEncoder, 0x03)); - CBOR_CHECK(cbor_encode_byte_string(&mapEncoder, aaguid, sizeof(aaguid))); - - CBOR_CHECK(cbor_encode_uint(&mapEncoder, 0x04)); - CBOR_CHECK(cbor_encoder_create_map(&mapEncoder, &arrayEncoder, 2)); - CBOR_CHECK(cbor_encode_text_stringz(&arrayEncoder, "rk")); - CBOR_CHECK(cbor_encode_boolean(&arrayEncoder, true)); - CBOR_CHECK(cbor_encode_text_stringz(&arrayEncoder, "clientPin")); - CBOR_CHECK(cbor_encode_boolean(&arrayEncoder, false)); - CBOR_CHECK(cbor_encoder_close_container(&mapEncoder, &arrayEncoder)); - - CBOR_CHECK(cbor_encode_uint(&mapEncoder, 0x06)); - CBOR_CHECK(cbor_encoder_create_array(&mapEncoder, &arrayEncoder, 1)); - CBOR_CHECK(cbor_encode_uint(&arrayEncoder, 1)); // PIN protocols - CBOR_CHECK(cbor_encoder_close_container(&mapEncoder, &arrayEncoder)); - - CBOR_CHECK(cbor_encode_uint(&mapEncoder, 0x07)); - CBOR_CHECK(cbor_encode_uint(&mapEncoder, 10)); // MAX_CRED_COUNT_IN_LIST - - CBOR_CHECK(cbor_encode_uint(&mapEncoder, 0x08)); - CBOR_CHECK(cbor_encode_uint(&mapEncoder, 1024)); // CRED_ID_MAX_LENGTH - - CBOR_CHECK(cbor_encoder_close_container(&encoder, &mapEncoder)); - err: - if (error != CborNoError) - return -ERR_INVALID_PAR; - size_t rs = cbor_encoder_get_buffer_size(&encoder, ctap_resp->init.data + 1); - driver_exec_finished(rs + 1); - return 0; -} - -int cbor_reset() { - driver_exec_finished(1); - return 0; -} - -int cbor_process(const uint8_t *data, size_t len) { - if (len == 0) - return -ERR_INVALID_LEN; - driver_prepare_response(); - if (data[0] == CTAP_MAKE_CREDENTIAL) - return cbor_make_credential(data + 1, len - 1); - if (data[0] == CTAP_GET_INFO) - return cbor_get_info(); - else if (data[0] == CTAP_RESET) - return cbor_reset(); - return -ERR_INVALID_PAR; -} - int driver_process_usb_packet(uint16_t read) { int apdu_sent = 0; if (read >= 5) @@ -591,15 +148,15 @@ int driver_process_usb_packet(uint16_t read) { DEBUG_PAYLOAD(usb_get_rx(),64); memset(ctap_resp, 0, sizeof(CTAPHID_FRAME)); if (ctap_req->cid == 0x0 || (ctap_req->cid == CID_BROADCAST && ctap_req->init.cmd != CTAPHID_INIT)) - return ctap_error(ERR_INVALID_CHANNEL); + return ctap_error(CTAP1_ERR_INVALID_CHANNEL); if (board_millis() < lock && ctap_req->cid != last_req.cid) - return ctap_error(ERR_CHANNEL_BUSY); + return ctap_error(CTAP1_ERR_CHANNEL_BUSY); if (FRAME_TYPE(ctap_req) == TYPE_INIT) { if (MSG_LEN(ctap_req) > CTAP_MAX_PACKET_SIZE) - return ctap_error(ERR_INVALID_LEN); + return ctap_error(CTAP1_ERR_INVALID_LEN); if (msg_packet.len > 0 && last_req.cid != ctap_req->cid) //We are in a transaction - return ctap_error(ERR_CHANNEL_BUSY); + return ctap_error(CTAP1_ERR_CHANNEL_BUSY); printf("command %x\n", FRAME_CMD(ctap_req)); printf("len %d\n", MSG_LEN(ctap_req)); msg_packet.len = msg_packet.current_len = 0; @@ -617,7 +174,7 @@ int driver_process_usb_packet(uint16_t read) { if (msg_packet.len == 0) //Received a cont with a prior init pkt return 0; if (last_seq != ctap_req->cont.seq) - return ctap_error(ERR_INVALID_SEQ); + return ctap_error(CTAP1_ERR_INVALID_SEQ); if (last_req.cid == ctap_req->cid) { memcpy(msg_packet.data + msg_packet.current_len, ctap_req->cont.data, MIN(64 - 5, msg_packet.len - msg_packet.current_len)); msg_packet.current_len += MIN(64 - 5, msg_packet.len - msg_packet.current_len); @@ -649,7 +206,7 @@ int driver_process_usb_packet(uint16_t read) { } else if (ctap_req->init.cmd == CTAPHID_WINK) { if (MSG_LEN(ctap_req) != 0) { - return ctap_error(ERR_INVALID_LEN); + return ctap_error(CTAP1_ERR_INVALID_LEN); } ctap_resp = (CTAPHID_FRAME *)usb_get_tx(); memcpy(ctap_resp, ctap_req, sizeof(CTAPHID_FRAME)); @@ -663,9 +220,9 @@ int driver_process_usb_packet(uint16_t read) { } else if (ctap_req->init.cmd == CTAPHID_LOCK) { if (MSG_LEN(ctap_req) != 1) - return ctap_error(ERR_INVALID_LEN); + return ctap_error(CTAP1_ERR_INVALID_LEN); if (ctap_req->init.data[0] > 10) - return ctap_error(ERR_INVALID_PAR); + return ctap_error(CTAP1_ERR_INVALID_PARAMETER); lock = board_millis() + ctap_req->init.data[0] * 1000; ctap_resp = (CTAPHID_FRAME *)usb_get_tx(); memset(ctap_resp, 0, 64); @@ -692,7 +249,7 @@ int driver_process_usb_packet(uint16_t read) { } else { if (msg_packet.len == 0) - return ctap_error(ERR_INVALID_CMD); + return ctap_error(CTAP1_ERR_INVALID_CMD); } // echo back anything we received from host //tud_hid_report(0, buffer, bufsize);