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

[FL-2274] Inventing streams and moving FFF to them (#981)

Browse Source 
* Streams: string stream
* String stream: updated insert/delete api
* Streams: generic stream interface and string stream implementation
* Streams: helpers for insert and delete_and_insert
* FFF: now compatible with streams
* MinUnit: introduced tests with arguments
* FFF: stream access violation
* Streams: copy data between streams
* Streams: file stream
* FFF: documentation
* FFStream: documentation
* FFF: alloc as file
* MinUnit: support for nested tests
* Streams: changed delete_and_insert, now it returns success flag. Added ability dump stream inner parameters and data to cout.
* FFF: simplified file open function
* Streams: unit tests
* FFF: tests
* Streams: declare cache_size constant as define, to allow variable modified arrays
* FFF: lib moved to a separate folder
* iButton: new FFF
* RFID: new FFF
* Animations: new FFF
* IR: new FFF
* NFC: new FFF
* Flipper file format: delete lib
* U2F: new FFF
* Subghz: new FFF and streams
* Streams: read line
* Streams: split
* FuriCore: implement memset with extra asserts
* FuriCore: implement extra heap asserts without inventing memset
* Scene manager: protected access to the scene id stack with a size check
* NFC worker: dirty fix for issue where hal_nfc was busy on app start
* Furi: update allocator to erase memory on allocation. Replace furi_alloc with malloc.
* FuriCore: cleanup memmgr code.
* Furi HAL: furi_hal_init is split into critical and non-critical parts. The critical part is currently clock and console.
* Memmgr: added ability to track allocations and deallocations through console.
* FFStream: some speedup
* Streams, FF: minor fixes
* Tests: restore
* File stream: a slightly more thread-safe version of file_stream_delete_and_insert

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
SG
2022-02-19 05:53:46 +10:00
committed by GitHub
parent 242241987e
commit 274c12fc56
257 changed files with 4480 additions and 2657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/u2f/u2f.c
View File

@@ -93,7 +93,7 @@ static int u2f_uecc_random(uint8_t* dest, unsigned size) {
}
U2fData* u2f_alloc() {
return furi_alloc(sizeof(U2fData));
return malloc(sizeof(U2fData));
}
void u2f_free(U2fData* U2F) {

2
applications/u2f/u2f_app.c
View File

@@ -22,7 +22,7 @@ static void u2f_app_tick_event_callback(void* context) {
}
U2fApp* u2f_app_alloc() {
U2fApp* app = furi_alloc(sizeof(U2fApp));
U2fApp* app = malloc(sizeof(U2fApp));
app->gui = furi_record_open("gui");
app->notifications = furi_record_open("notification");

92
applications/u2f/u2f_data.c
View File

@@ -3,7 +3,7 @@
#include <furi_hal.h>
#include <storage/storage.h>
#include <furi_hal_random.h>
#include <flipper_file.h>
#include <flipper_format/flipper_format.h>
#define TAG "U2F"
@@ -147,22 +147,21 @@ static bool u2f_data_cert_key_encrypt(uint8_t* cert_key) {
furi_hal_crypto_store_unload_key(U2F_DATA_FILE_ENCRYPTION_KEY_SLOT_UNIQUE);
Storage* storage = furi_record_open("storage");
FlipperFile* flipper_file = flipper_file_alloc(storage);
FlipperFormat* flipper_format = flipper_format_file_alloc(storage);
if(flipper_file_open_always(flipper_file, U2F_CERT_KEY_FILE)) {
if(flipper_format_file_open_always(flipper_format, U2F_CERT_KEY_FILE)) {
do {
if(!flipper_file_write_header_cstr(
flipper_file, U2F_CERT_KEY_FILE_TYPE, U2F_CERT_KEY_VERSION))
if(!flipper_format_write_header_cstr(
flipper_format, U2F_CERT_KEY_FILE_TYPE, U2F_CERT_KEY_VERSION))
break;
if(!flipper_file_write_uint32(flipper_file, "Type", &cert_type, 1)) break;
if(!flipper_file_write_hex(flipper_file, "IV", iv, 16)) break;
if(!flipper_file_write_hex(flipper_file, "Data", key, 48)) break;
if(!flipper_format_write_uint32(flipper_format, "Type", &cert_type, 1)) break;
if(!flipper_format_write_hex(flipper_format, "IV", iv, 16)) break;
if(!flipper_format_write_hex(flipper_format, "Data", key, 48)) break;
state = true;
} while(0);
}
flipper_file_close(flipper_file);
flipper_file_free(flipper_file);
flipper_format_free(flipper_format);
furi_record_close("storage");
return state;
@@ -185,11 +184,11 @@ bool u2f_data_cert_key_load(uint8_t* cert_key) {
string_init(filetype);
Storage* storage = furi_record_open("storage");
FlipperFile* flipper_file = flipper_file_alloc(storage);
FlipperFormat* flipper_format = flipper_format_file_alloc(storage);
if(flipper_file_open_existing(flipper_file, U2F_CERT_KEY_FILE)) {
if(flipper_format_file_open_existing(flipper_format, U2F_CERT_KEY_FILE)) {
do {
if(!flipper_file_read_header(flipper_file, filetype, &version)) {
if(!flipper_format_read_header(flipper_format, filetype, &version)) {
FURI_LOG_E(TAG, "Missing or incorrect header");
break;
}
@@ -200,7 +199,7 @@ bool u2f_data_cert_key_load(uint8_t* cert_key) {
break;
}
if(!flipper_file_read_uint32(flipper_file, "Type", &cert_type, 1)) {
if(!flipper_format_read_uint32(flipper_format, "Type", &cert_type, 1)) {
FURI_LOG_E(TAG, "Missing cert type");
break;
}
@@ -216,12 +215,12 @@ bool u2f_data_cert_key_load(uint8_t* cert_key) {
break;
}
if(key_slot != 0) {
if(!flipper_file_read_hex(flipper_file, "IV", iv, 16)) {
if(!flipper_format_read_hex(flipper_format, "IV", iv, 16)) {
FURI_LOG_E(TAG, "Missing IV");
break;
}
if(!flipper_file_read_hex(flipper_file, "Data", key, 48)) {
if(!flipper_format_read_hex(flipper_format, "Data", key, 48)) {
FURI_LOG_E(TAG, "Missing data");
break;
}
@@ -239,7 +238,7 @@ bool u2f_data_cert_key_load(uint8_t* cert_key) {
}
furi_hal_crypto_store_unload_key(key_slot);
} else {
if(!flipper_file_read_hex(flipper_file, "Data", cert_key, 32)) {
if(!flipper_format_read_hex(flipper_format, "Data", cert_key, 32)) {
FURI_LOG_E(TAG, "Missing data");
break;
}
@@ -248,8 +247,7 @@ bool u2f_data_cert_key_load(uint8_t* cert_key) {
} while(0);
}
flipper_file_close(flipper_file);
flipper_file_free(flipper_file);
flipper_format_free(flipper_format);
furi_record_close("storage");
string_clear(filetype);
@@ -272,11 +270,11 @@ bool u2f_data_key_load(uint8_t* device_key) {
string_init(filetype);
Storage* storage = furi_record_open("storage");
FlipperFile* flipper_file = flipper_file_alloc(storage);
FlipperFormat* flipper_format = flipper_format_file_alloc(storage);
if(flipper_file_open_existing(flipper_file, U2F_KEY_FILE)) {
if(flipper_format_file_open_existing(flipper_format, U2F_KEY_FILE)) {
do {
if(!flipper_file_read_header(flipper_file, filetype, &version)) {
if(!flipper_format_read_header(flipper_format, filetype, &version)) {
FURI_LOG_E(TAG, "Missing or incorrect header");
break;
}
@@ -285,11 +283,11 @@ bool u2f_data_key_load(uint8_t* device_key) {
FURI_LOG_E(TAG, "Type or version mismatch");
break;
}
if(!flipper_file_read_hex(flipper_file, "IV", iv, 16)) {
if(!flipper_format_read_hex(flipper_format, "IV", iv, 16)) {
FURI_LOG_E(TAG, "Missing IV");
break;
}
if(!flipper_file_read_hex(flipper_file, "Data", key, 48)) {
if(!flipper_format_read_hex(flipper_format, "Data", key, 48)) {
FURI_LOG_E(TAG, "Missing data");
break;
}
@@ -307,8 +305,7 @@ bool u2f_data_key_load(uint8_t* device_key) {
state = true;
} while(0);
}
flipper_file_close(flipper_file);
flipper_file_free(flipper_file);
flipper_format_free(flipper_format);
furi_record_close("storage");
string_clear(filetype);
return state;
@@ -338,22 +335,21 @@ bool u2f_data_key_generate(uint8_t* device_key) {
furi_hal_crypto_store_unload_key(U2F_DATA_FILE_ENCRYPTION_KEY_SLOT_UNIQUE);
Storage* storage = furi_record_open("storage");
FlipperFile* flipper_file = flipper_file_alloc(storage);
FlipperFormat* flipper_format = flipper_format_file_alloc(storage);
if(flipper_file_open_always(flipper_file, U2F_KEY_FILE)) {
if(flipper_format_file_open_always(flipper_format, U2F_KEY_FILE)) {
do {
if(!flipper_file_write_header_cstr(
flipper_file, U2F_DEVICE_KEY_FILE_TYPE, U2F_DEVICE_KEY_VERSION))
if(!flipper_format_write_header_cstr(
flipper_format, U2F_DEVICE_KEY_FILE_TYPE, U2F_DEVICE_KEY_VERSION))
break;
if(!flipper_file_write_hex(flipper_file, "IV", iv, 16)) break;
if(!flipper_file_write_hex(flipper_file, "Data", key_encrypted, 48)) break;
if(!flipper_format_write_hex(flipper_format, "IV", iv, 16)) break;
if(!flipper_format_write_hex(flipper_format, "Data", key_encrypted, 48)) break;
state = true;
memcpy(device_key, key, 32);
} while(0);
}
flipper_file_close(flipper_file);
flipper_file_free(flipper_file);
flipper_format_free(flipper_format);
furi_record_close("storage");
return state;
@@ -372,11 +368,11 @@ bool u2f_data_cnt_read(uint32_t* cnt_val) {
string_init(filetype);
Storage* storage = furi_record_open("storage");
FlipperFile* flipper_file = flipper_file_alloc(storage);
FlipperFormat* flipper_format = flipper_format_file_alloc(storage);
if(flipper_file_open_existing(flipper_file, U2F_CNT_FILE)) {
if(flipper_format_file_open_existing(flipper_format, U2F_CNT_FILE)) {
do {
if(!flipper_file_read_header(flipper_file, filetype, &version)) {
if(!flipper_format_read_header(flipper_format, filetype, &version)) {
FURI_LOG_E(TAG, "Missing or incorrect header");
break;
}
@@ -385,11 +381,11 @@ bool u2f_data_cnt_read(uint32_t* cnt_val) {
FURI_LOG_E(TAG, "Type or version mismatch");
break;
}
if(!flipper_file_read_hex(flipper_file, "IV", iv, 16)) {
if(!flipper_format_read_hex(flipper_format, "IV", iv, 16)) {
FURI_LOG_E(TAG, "Missing IV");
break;
}
if(!flipper_file_read_hex(flipper_file, "Data", cnt_encr, 48)) {
if(!flipper_format_read_hex(flipper_format, "Data", cnt_encr, 48)) {
FURI_LOG_E(TAG, "Missing data");
break;
}
@@ -410,8 +406,7 @@ bool u2f_data_cnt_read(uint32_t* cnt_val) {
}
} while(0);
}
flipper_file_close(flipper_file);
flipper_file_free(flipper_file);
flipper_format_free(flipper_format);
furi_record_close("storage");
string_clear(filetype);
return state;
@@ -441,21 +436,20 @@ bool u2f_data_cnt_write(uint32_t cnt_val) {
furi_hal_crypto_store_unload_key(U2F_DATA_FILE_ENCRYPTION_KEY_SLOT_UNIQUE);
Storage* storage = furi_record_open("storage");
FlipperFile* flipper_file = flipper_file_alloc(storage);
FlipperFormat* flipper_format = flipper_format_file_alloc(storage);
if(flipper_file_open_always(flipper_file, U2F_CNT_FILE)) {
if(flipper_format_file_open_always(flipper_format, U2F_CNT_FILE)) {
do {
if(!flipper_file_write_header_cstr(
flipper_file, U2F_COUNTER_FILE_TYPE, U2F_COUNTER_VERSION))
if(!flipper_format_write_header_cstr(
flipper_format, U2F_COUNTER_FILE_TYPE, U2F_COUNTER_VERSION))
break;
if(!flipper_file_write_hex(flipper_file, "IV", iv, 16)) break;
if(!flipper_file_write_hex(flipper_file, "Data", cnt_encr, 48)) break;
if(!flipper_format_write_hex(flipper_format, "IV", iv, 16)) break;
if(!flipper_format_write_hex(flipper_format, "Data", cnt_encr, 48)) break;
state = true;
} while(0);
}
flipper_file_close(flipper_file);
flipper_file_free(flipper_file);
flipper_format_free(flipper_format);
furi_record_close("storage");
return state;

2
applications/u2f/u2f_hid.c
View File

@@ -277,7 +277,7 @@ static int32_t u2f_hid_worker(void* context) {
}
U2fHid* u2f_hid_start(U2fData* u2f_inst) {
U2fHid* u2f_hid = furi_alloc(sizeof(U2fHid));
U2fHid* u2f_hid = malloc(sizeof(U2fHid));
u2f_hid->u2f_instance = u2f_inst;

2
applications/u2f/views/u2f_view.c
View File

@@ -59,7 +59,7 @@ static bool u2f_view_input_callback(InputEvent* event, void* context) {
}
U2fView* u2f_view_alloc() {
U2fView* u2f = furi_alloc(sizeof(U2fView));
U2fView* u2f = malloc(sizeof(U2fView));
u2f->view = view_alloc();
view_allocate_model(u2f->view, ViewModelTypeLocking, sizeof(U2fModel));