arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-27 02:12:35 +00:00
Code Issues Releases Wiki Activity

CID hacks, not yet finished

Browse Source
This commit is contained in:
Jochen Hoenicke 2016-04-29 19:54:59 +02:00
parent 450a277f45
commit eb2ef2464c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/u2f.c
View File

@ -174,8 +174,9 @@ void u2fhid_read(const U2FHID_FRAME *f)
buf_ptr += sizeof(f->init.data); buf_ptr += sizeof(f->init.data);
// Broadcast is reserved for init // Broadcast is reserved for init
if (cid == CID_BROADCAST && cmd != U2FHID_INIT) if (f->cid == CID_BROADCAST && cmd != U2FHID_INIT)
return; return;
cid = f->cid;
// Check length isnt bigger than spec max // Check length isnt bigger than spec max
if (len > sizeof(buf)) { if (len > sizeof(buf)) {
@ -184,9 +185,6 @@ void u2fhid_read(const U2FHID_FRAME *f)
} }
} }
else { else {
// Broadcast is reserved for init
if (cid == CID_BROADCAST)
return;
// check out of bounds // check out of bounds
if ((buf_ptr - buf) >= (signed) len if ((buf_ptr - buf) >= (signed) len
|| (buf_ptr + sizeof(f->cont.data) - buf) > (signed) sizeof(buf)) || (buf_ptr + sizeof(f->cont.data) - buf) > (signed) sizeof(buf))
@ -258,13 +256,13 @@ void u2fhid_init(const U2FHID_INIT_REQ *init_req)
U2FHID_INIT_RESP *resp = (U2FHID_INIT_RESP *)f.init.data; U2FHID_INIT_RESP *resp = (U2FHID_INIT_RESP *)f.init.data;
bzero(&f, sizeof(f)); bzero(&f, sizeof(f));
f.cid = CID_BROADCAST; f.cid = cid;
f.init.cmd = U2FHID_INIT; f.init.cmd = U2FHID_INIT;
f.init.bcnth = 0; f.init.bcnth = 0;
f.init.bcntl = U2FHID_INIT_RESP_SIZE; f.init.bcntl = U2FHID_INIT_RESP_SIZE;
memcpy(resp->nonce, init_req->nonce, sizeof(init_req->nonce)); memcpy(resp->nonce, init_req->nonce, sizeof(init_req->nonce));
resp->cid = next_cid(); resp->cid = cid == CID_BROADCAST ? next_cid() : cid;
resp->versionInterface = U2FHID_IF_VERSION; resp->versionInterface = U2FHID_IF_VERSION;
resp->versionMajor = VERSION_MAJOR; resp->versionMajor = VERSION_MAJOR;
resp->versionMinor = VERSION_MINOR; resp->versionMinor = VERSION_MINOR;