arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-22 22:38:08 +00:00
Code Issues Releases Wiki Activity

throw UnexpectedMessage failure on unknown messages

Browse Source
This commit is contained in:
Pavol Rusnak 2014-06-06 02:45:15 +02:00
parent 1a1ba46e2c
commit 465ec2104b
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/Makefile
View File

@ -45,4 +45,3 @@ CFLAGS += -Iprotob -DPB_FIELD_16BIT=1
CFLAGS += -DDEBUG_LINK=0 CFLAGS += -DDEBUG_LINK=0
CFLAGS += -DDEBUG_LOG=0 CFLAGS += -DDEBUG_LOG=0
CFLAGS += -DSCM_REVISION='"$(shell git rev-parse HEAD | sed 's:\(..\):\\x\1:g')"' CFLAGS += -DSCM_REVISION='"$(shell git rev-parse HEAD | sed 's:\(..\):\\x\1:g')"'
CFLAGS += -DSCM_REVISION_LEN=20

3
firmware/fsm.c
View File

@ -111,7 +111,8 @@ void fsm_msgInitialize(Initialize *msg)
resp->has_pin_protection = true; resp->pin_protection = storage.has_pin; resp->has_pin_protection = true; resp->pin_protection = storage.has_pin;
resp->has_passphrase_protection = true; resp->passphrase_protection = storage.has_passphrase_protection && storage.passphrase_protection; resp->has_passphrase_protection = true; resp->passphrase_protection = storage.has_passphrase_protection && storage.passphrase_protection;
#ifdef SCM_REVISION #ifdef SCM_REVISION
resp->has_revision = true; memcpy(resp->revision.bytes, SCM_REVISION, sizeof(resp->revision)); resp->revision.size = SCM_REVISION_LEN; int len = sizeof(SCM_REVISION) - 1;
resp->has_revision = true; memcpy(resp->revision.bytes, SCM_REVISION, len); resp->revision.size = len;
#endif #endif
resp->has_bootloader_hash = true; resp->bootloader_hash.size = memory_bootloader_hash(resp->bootloader_hash.bytes); resp->has_bootloader_hash = true; resp->bootloader_hash.size = memory_bootloader_hash(resp->bootloader_hash.bytes);
if (storage.has_language) { if (storage.has_language) {

8
firmware/messages.c
View File

@ -290,6 +290,8 @@ void msg_read_common(char type, uint8_t *buf, int len)
static uint32_t msg_pos = 0; static uint32_t msg_pos = 0;
static const pb_field_t *fields = 0; static const pb_field_t *fields = 0;
if (len != 64) return;
if (read_state == READSTATE_IDLE) { if (read_state == READSTATE_IDLE) {
if (buf[0] != '?' || buf[1] != '#' || buf[2] != '#') { // invalid start - discard if (buf[0] != '?' || buf[1] != '#' || buf[2] != '#') { // invalid start - discard
return; return;
@ -299,7 +301,7 @@ void msg_read_common(char type, uint8_t *buf, int len)
fields = MessageFields(type, 'i', msg_id); fields = MessageFields(type, 'i', msg_id);
if (!fields) { // unknown message if (!fields) { // unknown message
// fsm_sendFailure(FailureType_Failure_UnexpectedMessage, "Unknown message"); fsm_sendFailure(FailureType_Failure_UnexpectedMessage, "Unknown message");
return; return;
} }
if (msg_size > MSG_IN_SIZE) { // message is too big :( if (msg_size > MSG_IN_SIZE) { // message is too big :(
@ -355,7 +357,7 @@ uint16_t msg_tiny_id = 0xFFFF;
void msg_read_tiny(uint8_t *buf, int len) void msg_read_tiny(uint8_t *buf, int len)
{ {
if (len < 9) return; if (len != 64) return;
if (buf[0] != '?' || buf[1] != '#' || buf[2] != '#') { if (buf[0] != '?' || buf[1] != '#' || buf[2] != '#') {
return; return;
} }
@ -402,7 +404,7 @@ void msg_read_tiny(uint8_t *buf, int len)
msg_tiny_id = 0xFFFF; msg_tiny_id = 0xFFFF;
} }
} else { } else {
// fsm_sendFailure(FailureType_Failure_UnexpectedMessage, "Unknown message"); fsm_sendFailure(FailureType_Failure_UnexpectedMessage, "Unknown message");
msg_tiny_id = 0xFFFF; msg_tiny_id = 0xFFFF;
} }
} }

14
firmware/protect.c
View File

@ -34,8 +34,11 @@ bool protectAbortedByInitialize = false;
bool protectButton(ButtonRequestType type, bool confirm_only) bool protectButton(ButtonRequestType type, bool confirm_only)
{ {
ButtonRequest resp; ButtonRequest resp;
bool result; bool result = false;
bool acked = false; bool acked = false;
#if DEBUG_LINK
bool debug_decided = false;
#endif
memset(&resp, 0, sizeof(ButtonRequest)); memset(&resp, 0, sizeof(ButtonRequest));
resp.has_code = true; resp.has_code = true;
@ -46,7 +49,7 @@ bool protectButton(ButtonRequestType type, bool confirm_only)
for (;;) { for (;;) {
usbPoll(); usbPoll();
// wait for ButtonAck // check for ButtonAck
if (msg_tiny_id == MessageType_MessageType_ButtonAck) { if (msg_tiny_id == MessageType_MessageType_ButtonAck) {
msg_tiny_id = 0xFFFF; msg_tiny_id = 0xFFFF;
acked = true; acked = true;
@ -66,6 +69,7 @@ bool protectButton(ButtonRequestType type, bool confirm_only)
} }
} }
// check for Cancel / Initialize
if (msg_tiny_id == MessageType_MessageType_Cancel || msg_tiny_id == MessageType_MessageType_Initialize) { if (msg_tiny_id == MessageType_MessageType_Cancel || msg_tiny_id == MessageType_MessageType_Initialize) {
if (msg_tiny_id == MessageType_MessageType_Initialize) { if (msg_tiny_id == MessageType_MessageType_Initialize) {
protectAbortedByInitialize = true; protectAbortedByInitialize = true;
@ -75,12 +79,16 @@ bool protectButton(ButtonRequestType type, bool confirm_only)
break; break;
} }
// check debug link
#if DEBUG_LINK #if DEBUG_LINK
// check DebugLink
if (msg_tiny_id == MessageType_MessageType_DebugLinkDecision) { if (msg_tiny_id == MessageType_MessageType_DebugLinkDecision) {
msg_tiny_id = 0xFFFF; msg_tiny_id = 0xFFFF;
DebugLinkDecision *dld = (DebugLinkDecision *)msg_tiny; DebugLinkDecision *dld = (DebugLinkDecision *)msg_tiny;
result = dld->yes_no; result = dld->yes_no;
debug_decided = true;
}
if (acked && debug_decided) {
break; break;
} }