Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-11 06:09:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

:doomed:

Browse Source
This commit is contained in:
Willy-JL
2023-05-02 21:29:46 +01:00
parent 6f04c94528
commit 5d62ce919b
2 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
applications/services/storage/storages/storage_int.c
View File

@@ -194,41 +194,41 @@ static void storage_int_lfs_mount(LFSData* lfs_data, StorageData* storage) {
if(need_format) {
// Backup U2F keys
lfs_file_t file;
uint8_t* cnt = NULL;
uint32_t cnt_size;
uint8_t* key = NULL;
uint32_t key_size;
if(lfs_mount(lfs, &lfs_data->config) == 0) {
FURI_LOG_I(TAG, "Factory reset: Mounted for backup");
// lfs_file_t file;
// uint8_t* cnt = NULL;
// uint32_t cnt_size;
// uint8_t* key = NULL;
// uint32_t key_size;
// if(lfs_mount(lfs, &lfs_data->config) == 0) {
// FURI_LOG_I(TAG, "Factory reset: Mounted for backup");
if(lfs_file_open(lfs, &file, ".cnt.u2f", LFS_O_RDONLY) == 0) {
cnt_size = file.ctz.size;
cnt = malloc(cnt_size);
if(lfs_file_read(lfs, &file, cnt, cnt_size) != (int32_t)cnt_size) {
free(cnt);
cnt = NULL;
}
lfs_file_close(lfs, &file);
if(lfs_file_open(lfs, &file, ".key.u2f", LFS_O_RDONLY) == 0) {
key_size = file.ctz.size;
key = malloc(key_size);
if(lfs_file_read(lfs, &file, key, key_size) != (int32_t)key_size) {
free(key);
key = NULL;
}
lfs_file_close(lfs, &file);
}
}
// if(lfs_file_open(lfs, &file, ".cnt.u2f", LFS_O_RDONLY) == 0) {
// cnt_size = file.ctz.size;
// cnt = malloc(cnt_size);
// if(lfs_file_read(lfs, &file, cnt, cnt_size) != (int32_t)cnt_size) {
// free(cnt);
// cnt = NULL;
// }
// lfs_file_close(lfs, &file);
// if(lfs_file_open(lfs, &file, ".key.u2f", LFS_O_RDONLY) == 0) {
// key_size = file.ctz.size;
// key = malloc(key_size);
// if(lfs_file_read(lfs, &file, key, key_size) != (int32_t)key_size) {
// free(key);
// key = NULL;
// }
// lfs_file_close(lfs, &file);
// }
// }
if(lfs_unmount(lfs) == 0) {
FURI_LOG_E(TAG, "Factory reset: Unmounted after backup");
} else {
FURI_LOG_E(TAG, "Factory reset: Unmount after backup failed");
}
} else {
FURI_LOG_E(TAG, "Factory reset: Mount for backup failed");
}
// if(lfs_unmount(lfs) == 0) {
// FURI_LOG_E(TAG, "Factory reset: Unmounted after backup");
// } else {
// FURI_LOG_E(TAG, "Factory reset: Unmount after backup failed");
// }
// } else {
// FURI_LOG_E(TAG, "Factory reset: Mount for backup failed");
// }
// Format storage
if(lfs_format(lfs, &lfs_data->config) == 0) {
@@ -239,19 +239,19 @@ static void storage_int_lfs_mount(LFSData* lfs_data, StorageData* storage) {
storage->status = StorageStatusOK;
// Restore U2F keys
if(cnt != NULL && key != NULL) {
if(lfs_file_open(lfs, &file, ".cnt.u2f", LFS_O_WRONLY | LFS_O_CREAT) == 0) {
lfs_file_write(lfs, &file, cnt, cnt_size);
lfs_file_close(lfs, &file);
if(lfs_file_open(lfs, &file, ".key.u2f", LFS_O_WRONLY | LFS_O_CREAT) ==
0) {
lfs_file_write(lfs, &file, key, key_size);
lfs_file_close(lfs, &file);
}
}
}
if(cnt != NULL) free(cnt);
if(key != NULL) free(key);
// if(cnt != NULL && key != NULL) {
// if(lfs_file_open(lfs, &file, ".cnt.u2f", LFS_O_WRONLY | LFS_O_CREAT) == 0) {
// lfs_file_write(lfs, &file, cnt, cnt_size);
// lfs_file_close(lfs, &file);
// if(lfs_file_open(lfs, &file, ".key.u2f", LFS_O_WRONLY | LFS_O_CREAT) ==
// 0) {
// lfs_file_write(lfs, &file, key, key_size);
// lfs_file_close(lfs, &file);
// }
// }
// }
// if(cnt != NULL) free(cnt);
// if(key != NULL) free(key);
} else {
FURI_LOG_E(TAG, "Factory reset: Mount after format failed");
storage->status = StorageStatusNotMounted;