From a5877f518f759d7d33466816dec41d51744de69d Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Tue, 20 Aug 2019 12:42:46 +0200
Subject: [PATCH] Additional assertions and reordering

---
 fido2/data_migration.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fido2/data_migration.c b/fido2/data_migration.c
index d525b8c..cb21e14 100644
--- a/fido2/data_migration.c
+++ b/fido2/data_migration.c
@@ -39,14 +39,17 @@ bool migrate_from_FF_to_01(AuthenticatorState_0xFF* state_prev_0xff, Authenticat
         crypto_sha256_final(state_tmp_ptr->PIN_CODE_HASH);
     }
 
+    assert(state_tmp_ptr->_reserved == state_prev_0xff->pin_code_length);
     state_tmp_ptr->_reserved = 0xFF;
     state_tmp_ptr->data_version = 1;
 
+    check(is_initialized);
     check(is_pin_set);
-    check(rk_stored);
     check(remaining_tries);
+    check(rk_stored);
     check_buf(key_lens);
     check_buf(key_space);
+    assert(state_tmp_ptr->data_version != 0xFF);
 
     return true;
 }