Merge remote-tracking branch 'noproto/nestednonces' into dev

DarkFlippers · Oct 9, 2024 · 1030574 · 1030574
2 parents af86cb2 + 3976f12
commit 1030574
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_dict_attack.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_dict_attack.c
@@ -141,14 +141,14 @@ static void nfc_scene_mf_classic_dict_attack_prepare_view(NfcApp* instance) {
     uint32_t state =
         scene_manager_get_scene_state(instance->scene_manager, NfcSceneMfClassicDictAttack);
     if(state == DictAttackStateCUIDDictInProgress) {
-        do {
-            size_t cuid_len = 0;
-            const uint8_t* cuid = nfc_device_get_uid(instance->nfc_device, &cuid_len);
-            FuriString* cuid_dict_path = furi_string_alloc_printf(
-                "%s/mf_classic_dict_%08lx.nfc",
-                EXT_PATH("nfc/assets"),
-                (uint32_t)bit_lib_bytes_to_num_be(cuid + (cuid_len - 4), 4));
+        size_t cuid_len = 0;
+        const uint8_t* cuid = nfc_device_get_uid(instance->nfc_device, &cuid_len);
+        FuriString* cuid_dict_path = furi_string_alloc_printf(
+            "%s/mf_classic_dict_%08lx.nfc",
+            EXT_PATH("nfc/assets"),
+            (uint32_t)bit_lib_bytes_to_num_be(cuid + (cuid_len - 4), 4));
 
+        do {
             if(!keys_dict_check_presence(furi_string_get_cstr(cuid_dict_path))) {
                 state = DictAttackStateUserDictInProgress;
                 break;
@@ -159,8 +159,6 @@ static void nfc_scene_mf_classic_dict_attack_prepare_view(NfcApp* instance) {
                 KeysDictModeOpenExisting,
                 sizeof(MfClassicKey));
 
-            furi_string_free(cuid_dict_path);
-
             if(keys_dict_get_total_keys(instance->nfc_dict_context.dict) == 0) {
                 keys_dict_free(instance->nfc_dict_context.dict);
                 state = DictAttackStateUserDictInProgress;
@@ -169,6 +167,8 @@ static void nfc_scene_mf_classic_dict_attack_prepare_view(NfcApp* instance) {
 
             dict_attack_set_header(instance->dict_attack, "MF Classic CUID Dictionary");
         } while(false);
+
+        furi_string_free(cuid_dict_path);
     }
     if(state == DictAttackStateUserDictInProgress) {
         do {

diff --git a/lib/nfc/protocols/mf_classic/mf_classic_poller.c b/lib/nfc/protocols/mf_classic/mf_classic_poller.c
@@ -20,8 +20,7 @@ const MfClassicBackdoorKeyPair mf_classic_backdoor_keys[] = {
     {{{0xa3, 0x16, 0x67, 0xa8, 0xce, 0xc1}}, MfClassicBackdoorAuth1}, // Fudan, Infineon, NXP
     {{{0x51, 0x8b, 0x33, 0x54, 0xe7, 0x60}}, MfClassicBackdoorAuth2}, // Fudan
 };
-const size_t mf_classic_backdoor_keys_count =
-    sizeof(mf_classic_backdoor_keys) / sizeof(mf_classic_backdoor_keys[0]);
+const size_t mf_classic_backdoor_keys_count = COUNT_OF(mf_classic_backdoor_keys);
 const uint16_t valid_sums[] =
     {0, 32, 56, 64, 80, 96, 104, 112, 120, 128, 136, 144, 152, 160, 176, 192, 200, 224, 256};