shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

support max hid msg size, dont always abort on msg err

Browse Source
This commit is contained in:
Conor Patrick 2018-05-26 17:27:10 -04:00
parent f73862ee3e
commit 8120829c2f
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ctaphid.c
View File

@ -310,8 +310,7 @@ start_over:
if (ctaphid_packet_len(pkt) > CTAPHID_BUFFER_SIZE) if (ctaphid_packet_len(pkt) > CTAPHID_BUFFER_SIZE)
{ {
printf("Error, internal buffer not big enough\n"); printf("Error, internal buffer not big enough\n");
ctaphid_send_error(pkt->cid, ERR_INVALID_LEN); ctaphid_send_error(pkt->cid, CTAP1_ERR_INVALID_LENGTH);
ctaphid_init();
return; return;
} }
} }
@ -322,7 +321,6 @@ start_over:
{ {
printf("Sequence error\n"); printf("Sequence error\n");
ctaphid_send_error(pkt->cid, ERR_INVALID_SEQ); ctaphid_send_error(pkt->cid, ERR_INVALID_SEQ);
ctaphid_init();
return; return;
} }
} }
@ -365,8 +363,7 @@ start_over:
if (buffer_len() != 8) if (buffer_len() != 8)
{ {
printf("Error,invalid length field for init packet\n"); printf("Error,invalid length field for init packet\n");
ctaphid_send_error(pkt->cid, ERR_INVALID_LEN); ctaphid_send_error(pkt->cid, CTAP1_ERR_INVALID_LENGTH);
ctaphid_init();
return; return;
} }
@ -412,8 +409,7 @@ start_over:
if (buffer_len() != 0) if (buffer_len() != 0)
{ {
printf("Error,invalid length field for wink packet\n"); printf("Error,invalid length field for wink packet\n");
ctaphid_send_error(pkt->cid, ERR_INVALID_LEN); ctaphid_send_error(pkt->cid, CTAP1_ERR_INVALID_LENGTH);
ctaphid_init();
return; return;
} }
@ -431,8 +427,7 @@ start_over:
if (buffer_len() == 0) if (buffer_len() == 0)
{ {
printf("Error,invalid 0 length field for cbor packet\n"); printf("Error,invalid 0 length field for cbor packet\n");
ctaphid_send_error(pkt->cid, ERR_INVALID_LEN); ctaphid_send_error(pkt->cid, CTAP1_ERR_INVALID_LENGTH);
ctaphid_init();
return; return;
} }
@ -454,8 +449,7 @@ start_over:
if (buffer_len() == 0) if (buffer_len() == 0)
{ {
printf("Error,invalid 0 length field for MSG/U2F packet\n"); printf("Error,invalid 0 length field for MSG/U2F packet\n");
ctaphid_send_error(pkt->cid, ERR_INVALID_LEN); ctaphid_send_error(pkt->cid, CTAP1_ERR_INVALID_LENGTH);
ctaphid_init();
return; return;
} }

7
ctaphid.h
View File

@ -2,6 +2,7 @@
#define _CTAPHID_H_H #define _CTAPHID_H_H
#include "usbhid.h" #include "usbhid.h"
#include "ctap_errors.h"
#define TYPE_INIT 0x80 #define TYPE_INIT 0x80
#define TYPE_CONT 0x00 #define TYPE_CONT 0x00
@ -17,7 +18,6 @@
#define ERR_INVALID_CMD 0x01 #define ERR_INVALID_CMD 0x01
#define ERR_INVALID_PAR 0x02 #define ERR_INVALID_PAR 0x02
#define ERR_INVALID_LEN 0x03
#define ERR_INVALID_SEQ 0x04 #define ERR_INVALID_SEQ 0x04
#define ERR_MSG_TIMEOUT 0x05 #define ERR_MSG_TIMEOUT 0x05
#define ERR_CHANNEL_BUSY 0x06 #define ERR_CHANNEL_BUSY 0x06
@ -28,15 +28,14 @@
#define CTAPHID_BROADCAST_CID 0xffffffff #define CTAPHID_BROADCAST_CID 0xffffffff
#define CTAPHID_BUFFER_SIZE 4096 #define CTAPHID_BUFFER_SIZE 7609
#define CAPABILITY_WINK 0x01 #define CAPABILITY_WINK 0x01
#define CAPABILITY_LOCK 0x02 #define CAPABILITY_LOCK 0x02
#define CAPABILITY_CBOR 0x04 #define CAPABILITY_CBOR 0x04
#define CAPABILITY_NMSG 0x08 #define CAPABILITY_NMSG 0x08
//#define CTAP_CAPABILITIES (CAPABILITY_WINK | CAPABILITY_CBOR) #define CTAP_CAPABILITIES (CAPABILITY_WINK | CAPABILITY_CBOR)
#define CTAP_CAPABILITIES (CAPABILITY_WINK )
typedef struct typedef struct
{ {