ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

review comments, init partly moved to restore, restore setting enabled, null check on filepath

pull/6932/head
paul-szczepanek-arm 2018-05-15 10:24:59 +01:00
parent 579cb5e222
commit f8244a3d87
1 changed files with 59 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
features/FEATURE_BLE/source/generic/FileSecurityDb.cpp
View File

@ -78,21 +78,10 @@ FileSecurityDb::FileSecurityDb(FILE *db_file)
fseek(_db_file, DB_OFFSET_RESTORE, SEEK_SET); fseek(_db_file, DB_OFFSET_RESTORE, SEEK_SET);
/* restore if requested */ /* restore if requested */
bool restore; bool restore_toggle;
if ((fread(&restore, sizeof(bool), 1, _db_file) == 1) && restore) { if (fread(&restore_toggle, sizeof(bool), 1, _db_file) == 1) {
fseek(_db_file, DB_OFFSET_LOCAL_IDENTITY, SEEK_SET); if (restore_toggle) {
fread(&_local_identity, sizeof(_local_identity), 1, _db_file); restore();
fseek(_db_file, DB_OFFSET_LOCAL_CSRK, SEEK_SET);
fread(&_local_csrk, sizeof(_local_csrk), 1, _db_file);
fseek(_db_file, DB_OFFSET_LOCAL_SIGN_COUNT, SEEK_SET);
fread(&_local_sign_counter, sizeof(_local_sign_counter), 1, _db_file);
fseek(_db_file, DB_OFFSET_ENTRIES, SEEK_SET);
/* we read the entries partially and fill the offsets ourselves*/
for (size_t i = 0; i < get_entry_count(); i++) {
fread(&_entries[i], DB_SIZE_ENTRY, 1, _db_file);
} }
} }
@ -107,49 +96,55 @@ FileSecurityDb::~FileSecurityDb() {
} }
FILE* FileSecurityDb::open_db_file(const char *db_path) { FILE* FileSecurityDb::open_db_file(const char *db_path) {
if (!db_path) {
return NULL;
}
FILE *db_file = fopen(db_path, "wb+"); FILE *db_file = fopen(db_path, "wb+");
if (db_file) {
/* we will check the db file and if the version or size doesn't match
* what we expect we will blank it */
bool init = false;
uint16_t version;
fseek(db_file, DB_OFFSET_VERSION, SEEK_SET); if (!db_file) {
return NULL;
}
if ((fread(&version, sizeof(version), 1, db_file) == 1) && /* we will check the db file and if the version or size doesn't match
(version == DB_VERSION)) { * what we expect we will blank it */
/* version checks out, try the size */ bool init = false;
fseek(db_file, DB_SIZE - 1, SEEK_SET); uint16_t version;
/* read one byte and expect to hit EOF */
if ((fread(&version, 1, 1, db_file) != 1) || !feof(db_file)) { fseek(db_file, DB_OFFSET_VERSION, SEEK_SET);
init = true;
} if ((fread(&version, sizeof(version), 1, db_file) == 1) &&
} else { (version == DB_VERSION)) {
/* version checks out, try the size */
fseek(db_file, DB_SIZE - 1, SEEK_SET);
/* read one byte and expect to hit EOF */
if ((fread(&version, 1, 1, db_file) != 1) || !feof(db_file)) {
init = true; init = true;
} }
} else {
init = true;
}
if (init) { if (init) {
fseek(db_file, 0, SEEK_SET); fseek(db_file, 0, SEEK_SET);
/* zero the file */ /* zero the file */
const uint32_t zero = 0; const uint32_t zero = 0;
size_t count = DB_SIZE / 4; size_t count = DB_SIZE / 4;
while (count--) { while (count--) {
if (fwrite(&zero, sizeof(zero), 1, db_file) != 1) { if (fwrite(&zero, sizeof(zero), 1, db_file) != 1) {
fclose(db_file);
return NULL;
}
}
if (fflush(db_file)) {
fclose(db_file); fclose(db_file);
return NULL; return NULL;
} }
} }
return db_file; if (fflush(db_file)) {
fclose(db_file);
return NULL;
}
} }
return NULL;
return db_file;
} }
SecurityDistributionFlags_t* FileSecurityDb::get_distribution_flags( SecurityDistributionFlags_t* FileSecurityDb::get_distribution_flags(
@ -287,6 +282,21 @@ void FileSecurityDb::set_entry_peer_sign_counter(
/* saving and loading from nvm */ /* saving and loading from nvm */
void FileSecurityDb::restore() { void FileSecurityDb::restore() {
fseek(_db_file, DB_OFFSET_LOCAL_IDENTITY, SEEK_SET);
fread(&_local_identity, sizeof(_local_identity), 1, _db_file);
fseek(_db_file, DB_OFFSET_LOCAL_CSRK, SEEK_SET);
fread(&_local_csrk, sizeof(_local_csrk), 1, _db_file);
fseek(_db_file, DB_OFFSET_LOCAL_SIGN_COUNT, SEEK_SET);
fread(&_local_sign_counter, sizeof(_local_sign_counter), 1, _db_file);
fseek(_db_file, DB_OFFSET_ENTRIES, SEEK_SET);
/* we read the entries partially and fill the offsets ourselves*/
for (size_t i = 0; i < get_entry_count(); i++) {
fread(&_entries[i], DB_SIZE_ENTRY, 1, _db_file);
}
} }
void FileSecurityDb::sync(entry_handle_t db_handle) { void FileSecurityDb::sync(entry_handle_t db_handle) {
@ -300,8 +310,12 @@ void FileSecurityDb::sync(entry_handle_t db_handle) {
} }
void FileSecurityDb::set_restore(bool reload) { void FileSecurityDb::set_restore(bool reload) {
fseek(_db_file, DB_OFFSET_RESTORE, SEEK_SET);
fwrite(&reload, sizeof(bool), 1, _db_file);
} }
/* helper functions */
uint8_t FileSecurityDb::get_entry_count() { uint8_t FileSecurityDb::get_entry_count() {
return MAX_ENTRIES; return MAX_ENTRIES;
} }