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

fix warnings

Browse Source
This commit is contained in:
Conor Patrick 2019-10-08 11:58:23 -04:00
parent 03e0479f1a
commit e67d05e3c1
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -39,7 +39,7 @@ INCLUDES += -I./crypto/cifra/src
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)
# for crypto/tiny-AES-c # for crypto/tiny-AES-c
CFLAGS += -DAES256=1 -DAPP_CONFIG=\"app.h\" CFLAGS += -DAES256=1 -DAPP_CONFIG=\"app.h\" -DSOLO_EXPERIMENTAL=1
name = main name = main

27
fido2/ctaphid.c
View File

@ -544,9 +544,9 @@ uint8_t ctaphid_custom_command(uint8_t cmd, uint32_t cid, int len, CTAP_RESPONSE
uint8_t ctaphid_handle_packet(uint8_t * pkt_raw) uint8_t ctaphid_handle_packet(uint8_t * pkt_raw)
{ {
uint8_t cmd; uint8_t cmd = 0;
uint32_t cid; uint32_t cid;
int len; int len = 0;
#ifndef DISABLE_CTAPHID_CBOR #ifndef DISABLE_CTAPHID_CBOR
int status; int status;
#endif #endif
@ -556,6 +556,7 @@ uint8_t ctaphid_handle_packet(uint8_t * pkt_raw)
CTAP_RESPONSE ctap_resp; CTAP_RESPONSE ctap_resp;
int bufstatus = ctaphid_buffer_packet(pkt_raw, &cmd, &cid, &len); int bufstatus = ctaphid_buffer_packet(pkt_raw, &cmd, &cid, &len);
ctaphid_write_buffer_init(&wb);
if (bufstatus == HID_IGNORE) if (bufstatus == HID_IGNORE)
{ {
@ -591,7 +592,6 @@ uint8_t ctaphid_handle_packet(uint8_t * pkt_raw)
case CTAPHID_PING: case CTAPHID_PING:
printf1(TAG_HID,"CTAPHID_PING\n"); printf1(TAG_HID,"CTAPHID_PING\n");
ctaphid_write_buffer_init(&wb);
wb.cid = cid; wb.cid = cid;
wb.cmd = CTAPHID_PING; wb.cmd = CTAPHID_PING;
wb.bcnt = len; wb.bcnt = len;
@ -606,7 +606,6 @@ uint8_t ctaphid_handle_packet(uint8_t * pkt_raw)
case CTAPHID_WINK: case CTAPHID_WINK:
printf1(TAG_HID,"CTAPHID_WINK\n"); printf1(TAG_HID,"CTAPHID_WINK\n");
ctaphid_write_buffer_init(&wb);
device_wink(); device_wink();
@ -637,7 +636,6 @@ uint8_t ctaphid_handle_packet(uint8_t * pkt_raw)
ctap_response_init(&ctap_resp); ctap_response_init(&ctap_resp);
status = ctap_request(ctap_buffer, len, &ctap_resp); status = ctap_request(ctap_buffer, len, &ctap_resp);
ctaphid_write_buffer_init(&wb);
wb.cid = cid; wb.cid = cid;
wb.cmd = CTAPHID_CBOR; wb.cmd = CTAPHID_CBOR;
wb.bcnt = (ctap_resp.length+1); wb.bcnt = (ctap_resp.length+1);
@ -670,7 +668,6 @@ uint8_t ctaphid_handle_packet(uint8_t * pkt_raw)
ctap_response_init(&ctap_resp); ctap_response_init(&ctap_resp);
u2f_request((struct u2f_request_apdu*)ctap_buffer, &ctap_resp); u2f_request((struct u2f_request_apdu*)ctap_buffer, &ctap_resp);
ctaphid_write_buffer_init(&wb);
wb.cid = cid; wb.cid = cid;
wb.cmd = CTAPHID_MSG; wb.cmd = CTAPHID_MSG;
wb.bcnt = (ctap_resp.length); wb.bcnt = (ctap_resp.length);
@ -703,19 +700,24 @@ uint8_t ctaphid_handle_packet(uint8_t * pkt_raw)
uint8_t ctaphid_custom_command(uint8_t cmd, uint32_t cid, int len, CTAP_RESPONSE * ctap_resp, CTAPHID_WRITE_BUFFER * wb) uint8_t ctaphid_custom_command(uint8_t cmd, uint32_t cid, int len, CTAP_RESPONSE * ctap_resp, CTAPHID_WRITE_BUFFER * wb)
{ {
uint8_t is_busy; ctap_response_init(ctap_resp);
ctaphid_write_buffer_init(wb);
#if !defined(IS_BOOTLOADER) && (defined(SOLO_HACKER) || defined(SOLO_EXPERIMENTAL))
uint32_t param; uint32_t param;
#endif
#if defined(IS_BOOTLOADER)
uint8_t is_busy;
#endif
switch(cmd) switch(cmd)
{ {
#if defined(IS_BOOTLOADER) #if defined(IS_BOOTLOADER)
case CTAPHID_BOOT: case CTAPHID_BOOT:
printf1(TAG_HID,"CTAPHID_BOOT\n"); printf1(TAG_HID,"CTAPHID_BOOT\n");
ctap_response_init(ctap_resp);
u2f_set_writeback_buffer(ctap_resp); u2f_set_writeback_buffer(ctap_resp);
is_busy = bootloader_bridge(len, ctap_buffer); is_busy = bootloader_bridge(len, ctap_buffer);
ctaphid_write_buffer_init(wb);
wb->cid = cid; wb->cid = cid;
wb->cmd = CTAPHID_BOOT; wb->cmd = CTAPHID_BOOT;
wb->bcnt = (ctap_resp->length + 1); wb->bcnt = (ctap_resp->length + 1);
@ -728,7 +730,6 @@ uint8_t ctaphid_custom_command(uint8_t cmd, uint32_t cid, int len, CTAP_RESPONSE
case CTAPHID_ENTERBOOT: case CTAPHID_ENTERBOOT:
printf1(TAG_HID,"CTAPHID_ENTERBOOT\n"); printf1(TAG_HID,"CTAPHID_ENTERBOOT\n");
boot_solo_bootloader(); boot_solo_bootloader();
ctaphid_write_buffer_init(wb);
wb->cid = cid; wb->cid = cid;
wb->cmd = CTAPHID_ENTERBOOT; wb->cmd = CTAPHID_ENTERBOOT;
wb->bcnt = 0; wb->bcnt = 0;
@ -743,8 +744,6 @@ uint8_t ctaphid_custom_command(uint8_t cmd, uint32_t cid, int len, CTAP_RESPONSE
#if !defined(IS_BOOTLOADER) #if !defined(IS_BOOTLOADER)
case CTAPHID_GETRNG: case CTAPHID_GETRNG:
printf1(TAG_HID,"CTAPHID_GETRNG\n"); printf1(TAG_HID,"CTAPHID_GETRNG\n");
ctap_response_init(ctap_resp);
ctaphid_write_buffer_init(wb);
wb->cid = cid; wb->cid = cid;
wb->cmd = CTAPHID_GETRNG; wb->cmd = CTAPHID_GETRNG;
wb->bcnt = ctap_buffer[0]; wb->bcnt = ctap_buffer[0];
@ -760,8 +759,6 @@ uint8_t ctaphid_custom_command(uint8_t cmd, uint32_t cid, int len, CTAP_RESPONSE
case CTAPHID_GETVERSION: case CTAPHID_GETVERSION:
printf1(TAG_HID,"CTAPHID_GETVERSION\n"); printf1(TAG_HID,"CTAPHID_GETVERSION\n");
ctap_response_init(ctap_resp);
ctaphid_write_buffer_init(wb);
wb->cid = cid; wb->cid = cid;
wb->cmd = CTAPHID_GETVERSION; wb->cmd = CTAPHID_GETVERSION;
wb->bcnt = 3; wb->bcnt = 3;
@ -803,8 +800,6 @@ uint8_t ctaphid_custom_command(uint8_t cmd, uint32_t cid, int len, CTAP_RESPONSE
param |= ctap_buffer[0] << 24; param |= ctap_buffer[0] << 24;
ctap_atomic_count(param); ctap_atomic_count(param);
ctap_response_init(ctap_resp);
ctaphid_write_buffer_init(wb);
wb->cid = cid; wb->cid = cid;
wb->cmd = CTAPHID_LOADKEY; wb->cmd = CTAPHID_LOADKEY;
wb->bcnt = 0; wb->bcnt = 0;