1.4.0 - Huge update

Changes:
 - Changed scenes, now they are more informative and beautiful (closes #6)
 - Check if sector is alive in Nested attacks (closes #5)
 - Now tag PRNG detected at sector, where key is available (fix not working with dead 0 sector, closes #4)
 - Detect hard PRNG from start, hardnested doesn't require calibration now
 - Settings menu: ability to always run Hard Nested (regardless of PRNG)
 - Minor code refactoring, a lot of bug fixes (memory leaks, stability improvements)
 - Fallback to Hard Nested now after 25 failed tries (was 10)

Hope I didn't break everything, but who knows...

Author: AloneLiberty

application.fam

@@ -13,19 +13,13 @@ App(
     fap_icon="assets/icon.png",
     fap_category="NFC",
     fap_private_libs=[
-        Lib(
-            name="nested",
-        ),
-        Lib(
-            name="parity",
-        ),
-        Lib(
-            name="crypto1",
-        )
+        Lib(name="nested"),
+        Lib(name="parity"),
+        Lib(name="crypto1")
     ],
     fap_icon_assets="assets",
     fap_author="AloneLiberty",
     fap_description="Recover Mifare Classic keys",
     fap_weburl="https://github.com/AloneLiberty/FlipperNested",
-    fap_version=(1,3)
+    fap_version=(1, 4)
 )

lib/nested/nested.c

@@ -169,9 +169,42 @@ static int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, const uint8_t*
                0;
 }
 
-MifareNestedNonceType nested_check_nonce_type(FuriHalNfcTxRxContext* tx_rx) {
+void nonce_distance_notable(uint32_t* msb, uint32_t* lsb) {
+    uint16_t x = 1, pos;
+    uint8_t calc_ok = 0;
+
+    for(uint16_t i = 1; i; ++i) {
+        pos = (x & 0xff) << 8 | x >> 8;
+
+        if((pos == *msb) & !(calc_ok >> 0 & 0x01)) {
+            *msb = i;
+            calc_ok |= 0x01;
+        }
+
+        if((pos == *lsb) & !(calc_ok >> 1 & 0x01)) {
+            *lsb = i;
+            calc_ok |= 0x02;
+        }
+
+        if(calc_ok == 0x03) {
+            return;
+        }
+
+        x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;
+    }
+}
+
+bool validate_prng_nonce_notable(uint32_t nonce) {
+    uint32_t msb = nonce >> 16;
+    uint32_t lsb = nonce & 0xffff;
+    nonce_distance_notable(&msb, &lsb);
+    return ((65535 - msb + lsb) % 65535) == 16;
+}
+
+MifareNestedNonceType nested_check_nonce_type(FuriHalNfcTxRxContext* tx_rx, uint8_t blockNo) {
     uint32_t nonces[5] = {};
-    uint16_t sameNonces = 0;
+    uint8_t sameNonces = 0;
+    uint8_t hardNonces = 0;
     Crypto1 crypt;
     Crypto1* crypto = {&crypt};
 
@@ -181,15 +214,15 @@ MifareNestedNonceType nested_check_nonce_type(FuriHalNfcTxRxContext* tx_rx) {
         furi_hal_nfc_activate_nfca(100, NULL);
 
         // Start communication
-        bool success = mifare_sendcmd_short(crypto, tx_rx, false, 0x60, 0);
+        bool success = mifare_sendcmd_short(crypto, tx_rx, false, 0x60, blockNo);
         if(!success) {
             continue;
         };
 
-        uint32_t byte = (uint32_t)nfc_util_bytes2num(tx_rx->rx_data, 4);
-
-        if(byte == 0) continue;
-        nonces[i] = byte;
+        uint32_t nt = (uint32_t)nfc_util_bytes2num(tx_rx->rx_data, 4);
+        if(nt == 0) continue;
+        if(!validate_prng_nonce_notable(nt)) hardNonces++;
+        nonces[i] = nt;
 
         nfc_deactivate();
     }
@@ -208,9 +241,13 @@ MifareNestedNonceType nested_check_nonce_type(FuriHalNfcTxRxContext* tx_rx) {
 
     if(sameNonces > 3) {
         return MifareNestedNonceStatic;
-    } else {
-        return MifareNestedNonce;
     }
+
+    if(hardNonces > 3) {
+        return MifareNestedNonceHard;
+    }
+
+    return MifareNestedNonceWeak;
 }
 
 struct nonce_info_static nested_static_nonce_attack(
@@ -404,12 +441,10 @@ struct distance_info nested_calibrate_distance_info(
         if(i != 65565) {
             if(rtr != 0) {
                 davg += i;
-                if(i != 0) {
-                    if(dmin == 0) {
-                        dmin = i;
-                    } else {
-                        dmin = MIN(dmin, i);
-                    }
+                if(dmin == 0) {
+                    dmin = i;
+                } else {
+                    dmin = MIN(dmin, i);
                 }
                 dmax = MAX(dmax, i);
             }
@@ -469,7 +504,10 @@ struct nonce_info nested_attack(
 
         while(r.target_nt[i] == 0) { // continue until we have an unambiguous nonce
             nfc_activate();
-            if(!furi_hal_nfc_activate_nfca(200, &cuid)) return r;
+            if(!furi_hal_nfc_activate_nfca(200, &cuid)) {
+                free(crypto);
+                return r;
+            }
 
             r.cuid = cuid;
 
@@ -524,7 +562,7 @@ struct nonce_info nested_attack(
                         break;
                     }
 
-                    FURI_LOG_D(TAG, "Nonce#%lu: valid, ntdist=%li", i + 1, j);
+                    FURI_LOG_D(TAG, "Nonce#%lu: valid, ntdist=%lu", i + 1, j);
                 }
             }
 
@@ -635,22 +673,42 @@ NestedCheckKeyResult nested_check_key(
     uint64_t ui64Key) {
     uint32_t cuid = 0;
     uint32_t nt;
-    Crypto1* crypto = malloc(sizeof(Crypto1));
 
     nfc_activate();
     if(!furi_hal_nfc_activate_nfca(200, &cuid)) return NestedCheckKeyNoTag;
 
     FURI_LOG_D(
         TAG, "Checking %c key %012llX for block %u", !keyType ? 'A' : 'B', ui64Key, blockNo);
 
+    Crypto1* crypto = malloc(sizeof(Crypto1));
+
     bool success =
         mifare_classic_authex(crypto, tx_rx, cuid, blockNo, keyType, ui64Key, false, &nt);
 
+    free(crypto);
+
     nfc_deactivate();
 
     return success ? NestedCheckKeyValid : NestedCheckKeyInvalid;
 }
 
+bool nested_check_block(FuriHalNfcTxRxContext* tx_rx, uint8_t blockNo, uint8_t keyType) {
+    uint32_t cuid = 0;
+
+    nfc_activate();
+    if(!furi_hal_nfc_activate_nfca(200, &cuid)) return false;
+
+    Crypto1* crypto = malloc(sizeof(Crypto1));
+
+    bool success = mifare_sendcmd_short(crypto, tx_rx, false, 0x60 + (keyType & 0x01), blockNo);
+
+    free(crypto);
+
+    nfc_deactivate();
+
+    return success;
+}
+
 void nested_get_data(FuriHalNfcDevData* dev_data) {
     nfc_activate();
     furi_hal_nfc_detect(dev_data, 400);

lib/nested/nested.h

@@ -10,12 +10,12 @@
 
 typedef enum {
     MifareNestedNonceNoTag,
-
-    MifareNestedNonce,
-    MifareNestedNonceStatic
+    MifareNestedNonceWeak,
+    MifareNestedNonceStatic,
+    MifareNestedNonceHard,
 } MifareNestedNonceType;
 
-MifareNestedNonceType nested_check_nonce_type(FuriHalNfcTxRxContext* tx_rx);
+MifareNestedNonceType nested_check_nonce_type(FuriHalNfcTxRxContext* tx_rx, uint8_t blockNo);
 
 struct nonce_info_static {
     uint32_t cuid;
@@ -99,6 +99,8 @@ NestedCheckKeyResult nested_check_key(
     uint8_t keyType,
     uint64_t ui64Key);
 
+bool nested_check_block(FuriHalNfcTxRxContext* tx_rx, uint8_t blockNo, uint8_t keyType);
+
 void nested_get_data();
 
 bool mifare_classic_authex(

mifare_nested.c

@@ -270,6 +270,13 @@ MifareNested* mifare_nested_alloc() {
         MifareNestedViewWidget,
         widget_get_view(mifare_nested->widget));
 
+    // Variable Item List
+    mifare_nested->variable_item_list = variable_item_list_alloc();
+    view_dispatcher_add_view(
+        mifare_nested->view_dispatcher,
+        MifareNestedViewVariableList,
+        variable_item_list_get_view(mifare_nested->variable_item_list));
+
     // Nested attack state
     NestedState* plugin_state = collection_alloc();
     view_set_context(plugin_state->view, mifare_nested);
@@ -287,6 +294,10 @@ MifareNested* mifare_nested_alloc() {
     KeyInfo_t* key_info = malloc(sizeof(KeyInfo_t));
     mifare_nested->keys = key_info;
 
+    MifareNestedSettings* settings = malloc(sizeof(MifareNestedSettings));
+    settings->only_hardnested = false;
+    mifare_nested->settings = settings;
+
     view_set_draw_callback(plugin_state->view, nested_draw_callback);
     view_set_input_callback(plugin_state->view, nested_input_callback);
 
@@ -325,15 +336,26 @@ void mifare_nested_free(MifareNested* mifare_nested) {
     view_dispatcher_remove_view(mifare_nested->view_dispatcher, MifareNestedViewWidget);
     widget_free(mifare_nested->widget);
 
+    // Variable Item List
+    view_dispatcher_remove_view(mifare_nested->view_dispatcher, MifareNestedViewVariableList);
+    variable_item_list_free(mifare_nested->variable_item_list);
+
     // Nested
     view_dispatcher_remove_view(mifare_nested->view_dispatcher, MifareNestedViewCollecting);
 
     // Check keys
     view_dispatcher_remove_view(mifare_nested->view_dispatcher, MifareNestedViewCheckKeys);
 
+    // Nonces states
     free(mifare_nested->nonces);
     free(mifare_nested->nested_state);
 
+    // Keys
+    free(mifare_nested->keys);
+
+    // Settings
+    free(mifare_nested->settings);
+
     // Worker
     mifare_nested_worker_stop(mifare_nested->worker);
     mifare_nested_worker_free(mifare_nested->worker);

mifare_nested_i.h

@@ -17,9 +17,11 @@
 #include <storage/storage.h>
 #include <lib/toolbox/path.h>
 #include <lib/nfc/nfc_device.h>
+#include <lib/toolbox/value_index.h>
+#include <gui/modules/variable_item_list.h>
 #include "mifare_nested_icons.h"
 
-#define NESTED_VERSION_APP "1.3.0"
+#define NESTED_VERSION_APP "1.4.0"
 #define NESTED_GITHUB_LINK "https://github.com/AloneLiberty/FlipperNested"
 #define NESTED_RECOVER_KEYS_GITHUB_LINK "https://github.com/AloneLiberty/FlipperNestedRecovery"
 #define NESTED_NONCE_FORMAT_VERSION "3"
@@ -33,6 +35,7 @@ enum MifareNestedCustomEvent {
     MifareNestedCustomEventWorkerExit,
     MifareNestedCustomEventByteInputDone,
     MifareNestedCustomEventTextInputDone,
+    MifareNestedCustomEventSceneSettingLock
 };
 
 typedef void (*NestedCallback)(void* context);
@@ -67,6 +70,10 @@ typedef struct {
     InputEvent input;
 } PluginEvent;
 
+typedef struct {
+    bool only_hardnested;
+} MifareNestedSettings;
+
 typedef enum { NestedRunIdle, NestedRunCheckKeys, NestedRunAttack } NestedRunNext;
 
 struct MifareNested {
@@ -76,7 +83,8 @@ struct MifareNested {
     NotificationApp* notifications;
     SceneManager* scene_manager;
     NfcDevice* nfc_dev;
-
+    VariableItemList* variable_item_list;
+    MifareNestedSettings* settings;
     FuriString* text_box_store;
 
     // Common Views
@@ -103,6 +111,7 @@ typedef enum {
     MifareNestedViewLoading,
     MifareNestedViewTextInput,
     MifareNestedViewWidget,
+    MifareNestedViewVariableList,
     MifareNestedViewCollecting,
     MifareNestedViewCheckKeys,
 } MifareNestedView;