dearsky/pico-hsm
1
0
Fork 0
Code Issues 17 Pull Requests 4 Actions Packages Projects Releases 26 Wiki Activity

More candy debug.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2022-02-25 17:03:28 +01:00
parent 6777221e48
commit 36cd26acd3
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
hsm2040.c
View File

@@ -380,10 +380,11 @@ enum {
static uint32_t blink_interval_ms = BLINK_NOT_MOUNTED; static uint32_t blink_interval_ms = BLINK_NOT_MOUNTED;
void usb_tx_enable(const void *buf, uint32_t len) void usb_tx_enable(const uint8_t *buf, uint32_t len)
{ {
if (len > 0) { if (len > 0) {
//DEBUG_PAYLOAD(((uint8_t *)buf),len); if (buf[0] == 0x80)
DEBUG_PAYLOAD(buf+CCID_MSG_HEADER_SIZE,len-CCID_MSG_HEADER_SIZE);
tud_vendor_write(buf, len); tud_vendor_write(buf, len);
} }
} }
@@ -406,8 +407,8 @@ void usb_tx_enable(const void *buf, uint32_t len)
* *
*/ */
static const uint8_t ATR_head[] = { static const uint8_t ATR_head[] = {
0x3b, 0xda, 0x11, 0xff, 0x81, 0xb1, 0xfe, 0x55, 0x1f, 0x03, //0x3b, 0xda, 0x11, 0xff, 0x81, 0xb1, 0xfe, 0x55, 0x1f, 0x03,
//0x3B,0xFE,0x18,0x00,0x00,0x81,0x31,0xFE,0x45,0x80,0x31,0x81,0x54,0x48,0x53,0x4D,0x31,0x73,0x80,0x21,0x40,0x81,0x07,0xFA 0x3B,0xFE,0x18,0x00,0x00,0x81,0x31,0xFE,0x45,0x80,0x31,0x81,0x54,0x48,0x53,0x4D,0x31,0x73,0x80,0x21,0x40,0x81,0x07,0xFA
}; };
/* Send back ATR (Answer To Reset) */ /* Send back ATR (Answer To Reset) */
@@ -1413,7 +1414,8 @@ static int usb_event_handle(struct ccid *c)
if (tud_vendor_available() && c->epo->ready) if (tud_vendor_available() && c->epo->ready)
{ {
uint32_t count = tud_vendor_read(endp1_rx_buf, sizeof(endp1_rx_buf)); uint32_t count = tud_vendor_read(endp1_rx_buf, sizeof(endp1_rx_buf));
//DEBUG_PAYLOAD(endp1_rx_buf, count); if (endp1_rx_buf[0] == 0x6F)
DEBUG_PAYLOAD(endp1_rx_buf+CCID_MSG_HEADER_SIZE, count-CCID_MSG_HEADER_SIZE);
ccid_rx_ready(count); ccid_rx_ready(count);
} }
return 0; return 0;
@@ -1438,7 +1440,7 @@ void prepare_ccid()
int process_apdu() { int process_apdu() {
if (!current_app) { if (!current_app) {
if (INS(apdu) == 0xA4 && P1(apdu) == 0x04 && P2(apdu) == 0x00) { //select by AID if (INS(apdu) == 0xA4 && P1(apdu) == 0x04 && (P2(apdu) == 0x00 || P2(apdu) == 0x4)) { //select by AID
for (int a = 0; a < num_apps; a++) { for (int a = 0; a < num_apps; a++) {
if ((current_app = apps[a].select_aid(&apps[a]))) { if ((current_app = apps[a].select_aid(&apps[a]))) {
return set_res_sw(0x90,0x00); return set_res_sw(0x90,0x00);
@@ -1566,6 +1568,7 @@ void card_thread()
break; break;
process_apdu(); process_apdu();
done:; done:;
uint32_t flag = EV_EXEC_FINISHED; uint32_t flag = EV_EXEC_FINISHED;
queue_add_blocking(ccid_comm, &flag); queue_add_blocking(ccid_comm, &flag);

20
hsm2040.h
View File

@@ -26,20 +26,20 @@ extern int register_app(app_t * (*)());
extern const uint8_t historical_bytes[]; extern const uint8_t historical_bytes[];
#define DEBUG_PAYLOAD(p,s) { \ #define DEBUG_PAYLOAD(p,s) { \
TU_LOG1("Payload %s (%d bytes):\r\n", #p,s);\ printf("Payload %s (%d bytes):\r\n", #p,s);\
for (int i = 0; i < s; i += 16) {\ for (int i = 0; i < s; i += 16) {\
TU_LOG1("%07Xh : ",i+p);\ printf("%07Xh : ",i+p);\
for (int j = 0; j < 16; j++) {\ for (int j = 0; j < 16; j++) {\
if (j < s-i) TU_LOG1("%02X ",p[i+j]);\ if (j < s-i) printf("%02X ",(p)[i+j]);\
else TU_LOG1(" ");\ else printf(" ");\
if (j == 7) TU_LOG1(" ");\ if (j == 7) printf(" ");\
} TU_LOG1(": "); \ } printf(": "); \
for (int j = 0; j < MIN(16,s-i); j++) {\ for (int j = 0; j < MIN(16,s-i); j++) {\
TU_LOG1("%c",p[i+j] == 0x0a || p[i+j] == 0x0d ? '\\' : p[i+j]);\ printf("%c",(p)[i+j] == 0x0a || (p)[i+j] == 0x0d ? '\\' : (p)[i+j]);\
if (j == 7) TU_LOG1(" ");\ if (j == 7) printf(" ");\
}\ }\
TU_LOG1("\r\n");\ printf("\r\n");\
} TU_LOG1("\r\n"); \ } printf("\r\n"); \
} }
struct apdu { struct apdu {