liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

U2F: counter file migration (#1604)

Browse Source 
Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Nikolay Minaylov 2022-08-17 18:40:06 +03:00 committed by GitHub
parent 560ea5f995
commit 6c268ec581
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
applications/u2f/u2f_data.c
View File

@ -1,5 +1,5 @@
#include <furi.h> #include <furi.h>
#include "u2f_hid.h" #include "u2f_data.h"
#include <furi_hal.h> #include <furi_hal.h>
#include <storage/storage.h> #include <storage/storage.h>
#include <furi_hal_random.h> #include <furi_hal_random.h>
@ -28,7 +28,8 @@
#define U2F_DEVICE_KEY_VERSION 1 #define U2F_DEVICE_KEY_VERSION 1
#define U2F_COUNTER_FILE_TYPE "Flipper U2F Counter File" #define U2F_COUNTER_FILE_TYPE "Flipper U2F Counter File"
#define U2F_COUNTER_VERSION 1 #define U2F_COUNTER_VERSION 2
#define U2F_COUNTER_VERSION_OLD 1
#define U2F_COUNTER_CONTROL_VAL 0xAA5500FF #define U2F_COUNTER_CONTROL_VAL 0xAA5500FF
@ -359,6 +360,7 @@ bool u2f_data_cnt_read(uint32_t* cnt_val) {
furi_assert(cnt_val); furi_assert(cnt_val);
bool state = false; bool state = false;
bool old_counter = false;
uint8_t iv[16]; uint8_t iv[16];
U2fCounterData cnt; U2fCounterData cnt;
uint8_t cnt_encr[48]; uint8_t cnt_encr[48];
@ -376,9 +378,16 @@ bool u2f_data_cnt_read(uint32_t* cnt_val) {
FURI_LOG_E(TAG, "Missing or incorrect header"); FURI_LOG_E(TAG, "Missing or incorrect header");
break; break;
} }
if(strcmp(string_get_cstr(filetype), U2F_COUNTER_FILE_TYPE) != 0 || if(strcmp(string_get_cstr(filetype), U2F_COUNTER_FILE_TYPE) != 0) {
version != U2F_COUNTER_VERSION) { FURI_LOG_E(TAG, "Type mismatch");
FURI_LOG_E(TAG, "Type or version mismatch"); break;
}
if(version == U2F_COUNTER_VERSION_OLD) {
// Counter is from previous U2F app version with endianness bug
FURI_LOG_W(TAG, "Counter from old version");
old_counter = true;
} else if(version != U2F_COUNTER_VERSION) {
FURI_LOG_E(TAG, "Version mismatch");
break; break;
} }
if(!flipper_format_read_hex(flipper_format, "IV", iv, 16)) { if(!flipper_format_read_hex(flipper_format, "IV", iv, 16)) {
@ -409,6 +418,13 @@ bool u2f_data_cnt_read(uint32_t* cnt_val) {
flipper_format_free(flipper_format); flipper_format_free(flipper_format);
furi_record_close(RECORD_STORAGE); furi_record_close(RECORD_STORAGE);
string_clear(filetype); string_clear(filetype);
if(old_counter && state) {
// Change counter endianness and rewrite counter file
*cnt_val = __REV(cnt.counter);
state = u2f_data_cnt_write(*cnt_val);
}
return state; return state;
} }