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

legacy/u2f: Add bogus app ID used by Firefox to indicate error in U2F. Figure out which error to display based on past U2F_AUTHENTICATE check-only requests on the same channel.

Browse Source
This commit is contained in:
Andrew Kozlik 2020-04-23 13:27:23 +02:00 committed by Andrew Kozlik
parent 65b0eae89d
commit 2e29f7bba6
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
legacy/firmware/u2f.c
View File

@ -48,6 +48,9 @@
// Initialise without a cid // Initialise without a cid
static uint32_t cid = 0; static uint32_t cid = 0;
// The channel ID of the last successful U2F_AUTHENTICATE check-only request.
static uint32_t last_good_auth_check_cid = 0;
// Circular Output buffer // Circular Output buffer
static uint32_t u2f_out_start = 0; static uint32_t u2f_out_start = 0;
static uint32_t u2f_out_end = 0; static uint32_t u2f_out_end = 0;
@ -63,7 +66,9 @@ static uint8_t u2f_out_packets[U2F_OUT_PKT_BUFFER_LEN][HID_RPT_SIZE];
// Defined as UsbSignHandler.BOGUS_APP_ID_HASH // Defined as UsbSignHandler.BOGUS_APP_ID_HASH
// in // in
// https://github.com/google/u2f-ref-code/blob/master/u2f-chrome-extension/usbsignhandler.js#L118 // https://github.com/google/u2f-ref-code/blob/master/u2f-chrome-extension/usbsignhandler.js#L118
#define BOGUS_APPID "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" #define BOGUS_APPID_CHROME "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
#define BOGUS_APPID_FIREFOX \
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
// Auth/Register request state machine // Auth/Register request state machine
typedef enum { typedef enum {
@ -553,10 +558,18 @@ void u2f_register(const APDU *a) {
if (last_req_state == INIT) { if (last_req_state == INIT) {
// error: testof-user-presence is required // error: testof-user-presence is required
buttonUpdate(); // Clear button state buttonUpdate(); // Clear button state
if (0 == memcmp(req->appId, BOGUS_APPID, U2F_APPID_SIZE)) { if (0 == memcmp(req->appId, BOGUS_APPID_CHROME, U2F_APPID_SIZE) ||
layoutDialog(&bmp_icon_warning, NULL, _("OK"), NULL, 0 == memcmp(req->appId, BOGUS_APPID_FIREFOX, U2F_APPID_SIZE)) {
_("Another U2F device"), _("was used to register"), if (cid == last_good_auth_check_cid) {
_("in this application."), NULL, NULL, NULL); layoutDialog(&bmp_icon_warning, NULL, _("OK"), NULL,
_("Already registered."), NULL, _("This U2F device is"),
_("already registered"), _("in this application."), NULL);
} else {
layoutDialog(&bmp_icon_warning, NULL, _("OK"), NULL,
_("Not registered."), NULL, _("Another U2F device"),
_("was used to register"), _("in this application."),
NULL);
}
} else { } else {
const char *appname = NULL; const char *appname = NULL;
getReadableAppId(req->appId, &appname); getReadableAppId(req->appId, &appname);
@ -670,6 +683,7 @@ void u2f_authenticate(const APDU *a) {
// A failed check would have happened earlier // A failed check would have happened earlier
// error: testof-user-presence is required // error: testof-user-presence is required
send_u2f_error(U2F_SW_CONDITIONS_NOT_SATISFIED); send_u2f_error(U2F_SW_CONDITIONS_NOT_SATISFIED);
last_good_auth_check_cid = cid;
return; return;
} }