arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-22 13:21:03 +00:00
Code Issues Releases Wiki Activity

use MEMSET_BZERO and U2F_APPID_SIZE macros

Browse Source
This commit is contained in:
Pavol Rusnak 2016-05-11 14:02:06 +02:00
parent 6218770e26
commit 9006c90a59
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.include
View File

@ -14,7 +14,7 @@ DBGFLAGS ?= -g -DNDEBUG
CFLAGS += $(OPTFLAGS) \
$(DBGFLAGS) \
-std=c99 \
-std=gnu99 \
-W \
-Wall \
-Wextra \

19
firmware/u2f.c
View File

@ -33,6 +33,7 @@
#include "rng.h"
#include "hmac.h"
#include "util.h"
#include "macros.h"
#include "u2f/u2f.h"
#include "u2f/u2f_hid.h"
@ -240,7 +241,7 @@ void u2fhid_wink(const uint8_t *buf, uint32_t len)
dialog_timeout = U2F_TIMEOUT;
U2FHID_FRAME f;
bzero(&f, sizeof(f));
MEMSET_BZERO(&f, sizeof(f));
f.cid = cid;
f.init.cmd = U2FHID_WINK;
f.init.bcntl = 0;
@ -253,7 +254,7 @@ void u2fhid_init(const U2FHID_INIT_REQ *init_req)
U2FHID_FRAME f;
U2FHID_INIT_RESP *resp = (U2FHID_INIT_RESP *)f.init.data;
bzero(&f, sizeof(f));
MEMSET_BZERO(&f, sizeof(f));
f.cid = CID_BROADCAST;
f.init.cmd = U2FHID_INIT;
f.init.bcnth = 0;
@ -340,7 +341,7 @@ void send_u2fhid_msg(const uint8_t cmd, const uint8_t *data, const uint32_t len)
// debugLog(0, "", "send_u2fhid_msg");
bzero(&f, sizeof(f));
MEMSET_BZERO(&f, sizeof(f));
f.cid = cid;
f.init.cmd = cmd;
f.init.bcnth = len >> 8;
@ -356,7 +357,7 @@ void send_u2fhid_msg(const uint8_t cmd, const uint8_t *data, const uint32_t len)
// Cont packet(s)
for (; l > 0; l -= psz, p += psz) {
// debugLog(0, "", "send_u2fhid_msg con");
bzero(&f.cont.data, sizeof(f.cont.data));
MEMSET_BZERO(&f.cont.data, sizeof(f.cont.data));
f.cont.seq = seq++;
psz = MIN(sizeof(f.cont.data), l);
memcpy(f.cont.data, p, psz);
@ -373,7 +374,7 @@ void send_u2fhid_error(uint8_t err)
{
U2FHID_FRAME f;
bzero(&f, sizeof(f));
MEMSET_BZERO(&f, sizeof(f));
f.cid = cid;
f.init.cmd = U2FHID_ERROR;
f.init.bcntl = 1;
@ -391,18 +392,18 @@ void u2f_version(const APDU *a)
send_u2f_msg(version_response, sizeof(version_response));
}
static const char *getReadableAppId(const uint8_t appid[32]) {
static const char *getReadableAppId(const uint8_t appid[U2F_APPID_SIZE]) {
unsigned int i;
static char buf[6+2+6+1];
for (i = 0; i < sizeof(u2f_well_known)/sizeof(U2FWellKnown); i++) {
if (memcmp(appid, u2f_well_known[i].appid, 32) == 0)
if (memcmp(appid, u2f_well_known[i].appid, U2F_APPID_SIZE) == 0)
return u2f_well_known[i].appname;
}
data2hex(appid, 3, &buf[0]);
buf[6] = buf[7] = '.';
data2hex(appid+(sizeof(appid)-3), 3, &buf[8]);
data2hex(appid + (U2F_APPID_SIZE - 3), 3, &buf[8]);
return buf;
}
@ -534,7 +535,7 @@ void u2f_register(const APDU *a)
if (last_req_state == REG_PASS) {
uint8_t data[sizeof(U2F_REGISTER_RESP) + 2];
U2F_REGISTER_RESP *resp = (U2F_REGISTER_RESP *)&data;
bzero(data, sizeof(data));
MEMSET_BZERO(data, sizeof(data));
resp->registerId = U2F_REGISTER_ID;

2
firmware/u2f_knownapps.h
View File

@ -29,7 +29,7 @@ typedef struct {
static const U2FWellKnown u2f_well_known[3] = {
{
// didn't feel like tracing that one yet
// https://www.gstatic.com/securitykey/origins.json
{ 0xa5,0x46,0x72,0xb2,0x22,0xc4,0xcf,0x95,
0xe1,0x51,0xed,0x8d,0x4d,0x3c,0x76,0x7a,
0x6c,0xc3,0x49,0x43,0x59,0x43,0x79,0x4e,

2
vendor/trezor-crypto vendored

@ -1 +1 @@
Subproject commit 406022acb4d43a48bb9d8afe392226f1fdeccec2
Subproject commit 23590c05c652efccdfb7e837a048adbecab5b145