shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Version used STATE data structures

Browse Source
This commit is contained in:
Szczepan Zalega 2019-08-20 11:57:32 +02:00
parent b452e3dfe4
commit 5a0cc0d02c
No known key found for this signature in database
GPG Key ID: D9BAE35991DE5B22
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fido2/data_migration.c
View File

@ -14,15 +14,13 @@
#define check(x) assert(state_prev_0xff->x == state_tmp_ptr->x); #define check(x) assert(state_prev_0xff->x == state_tmp_ptr->x);
#define check_buf(x) assert(memcmp(state_prev_0xff->x, state_tmp_ptr->x, sizeof(state_tmp_ptr->x)) == 0); #define check_buf(x) assert(memcmp(state_prev_0xff->x, state_tmp_ptr->x, sizeof(state_tmp_ptr->x)) == 0);
bool migrate_from_FF_to_01(AuthenticatorState* state_previous_ptr, AuthenticatorState* state_tmp_ptr){ bool migrate_from_FF_to_01(AuthenticatorState_0xFF* state_prev_0xff, AuthenticatorState_0x01* state_tmp_ptr){
// Calculate PIN hash, and replace PIN raw storage with it; add version to structure // Calculate PIN hash, and replace PIN raw storage with it; add version to structure
// other ingredients do not change // other ingredients do not change
if (state_tmp_ptr->data_version != 0xFF) if (state_tmp_ptr->data_version != 0xFF)
return false; return false;
static_assert(sizeof(AuthenticatorState_0xFF) <= sizeof(AuthenticatorState), "New state structure is smaller, than current one, which is not handled"); static_assert(sizeof(AuthenticatorState_0xFF) <= sizeof(AuthenticatorState_0x01), "New state structure is smaller, than current one, which is not handled");
AuthenticatorState_0xFF* state_prev_0xff = (AuthenticatorState_0xFF *) state_previous_ptr;
if (ctap_generate_rng(state_tmp_ptr->PIN_SALT, sizeof(state_tmp_ptr->PIN_SALT)) != 1) { if (ctap_generate_rng(state_tmp_ptr->PIN_SALT, sizeof(state_tmp_ptr->PIN_SALT)) != 1) {
printf2(TAG_ERR, "Error, rng failed\n"); printf2(TAG_ERR, "Error, rng failed\n");
@ -71,7 +69,7 @@ void do_migration_if_required(AuthenticatorState* state_current){
authenticator_read_state(&state_tmp); authenticator_read_state(&state_tmp);
if(state_current->data_version == 0xFF){ if(state_current->data_version == 0xFF){
printf2(TAG_ERR, "Running migration\n"); printf2(TAG_ERR, "Running migration\n");
bool success = migrate_from_FF_to_01(&state_previous, &state_tmp); bool success = migrate_from_FF_to_01((AuthenticatorState_0xFF *) &state_previous, &state_tmp);
if (!success){ if (!success){
printf2(TAG_ERR, "Failed migration from 0xFF to 1\n"); printf2(TAG_ERR, "Failed migration from 0xFF to 1\n");
// FIXME discuss migration failure behavior // FIXME discuss migration failure behavior

4
fido2/storage.h
View File

@ -53,7 +53,9 @@ typedef struct
uint16_t key_lens[MAX_KEYS]; uint16_t key_lens[MAX_KEYS];
uint8_t key_space[KEY_SPACE_BYTES]; uint8_t key_space[KEY_SPACE_BYTES];
uint8_t data_version; uint8_t data_version;
} AuthenticatorState; } AuthenticatorState_0x01;
typedef AuthenticatorState_0x01 AuthenticatorState;
typedef struct typedef struct