Squashed 'mifare_nested/' changes from eba6163d7..8dd6fc799

8dd6fc799 move base pack here
REVERT: eba6163d7 1.5.2 - Show correct amount of nonces to collect
REVERT: bcad03580 Too many files to change with update :(
REVERT: 89ac8e2fc 1.5.1 - Fix wrong invalid/skipped keys count
REVERT: 62a7c9b23 Add catalog readme
REVERT: 6cfd9f4e6 Add screenshots and banner for catalogs
REVERT: 86fc49fb7 1.5.0 - New update, new scene Changes:  - Added new scene with information about why nonces aren't collected (skipped/invalid)  - Removed some old code, breaking compability with old firmware  - App renamed from "Flipper (Mifare) Nested" to "Flipper Nested"
REVERT: 93581dd45 Fix compilation
REVERT: d52b43e38 1.4.6 - Fix fallback to hardnested
REVERT: 3a1bd745e 1.4.5 - Fix .nested folder if running Hard Nested Closes #8
REVERT: 9396a0948 1.4.4 - Fix my fix again
REVERT: f9df9e8dc 1.4.3 - Oops...
REVERT: 7548828ec 1.4.2 - Minor code refactor
REVERT: db21a62ed 1.4.1 - Fix invalid nonces after skipping
REVERT: 365099134 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)
REVERT: fb317dfbf 1.3.0 - Bump version in application.fam
REVERT: 34a54089a 1.3.0 - Check first_byte_sum (no more invalid ones)
REVERT: f15f92498 1.2.5 - Add missing file
REVERT: 71bdf7c41 1.2.4 - Leaks...
REVERT: f525e9707 1.2.3 - free string
REVERT: af4931307 1.2.2 - Migrate to file_stream, fix more memory leaks (this time not mine)
REVERT: 30a37965d 1.2.1 - Fix memory leaks
REVERT: a8f0a83ef 1.2.0 - Hard Nested attack
REVERT: 6c1eaa111 Merge branch 'dev' of https://github.com/AloneLiberty/FlipperNested into hardnested
REVERT: af164faa8 1.2.0 - Hard Nested attack
REVERT: abb4d163d Commas
REVERT: a50dab5d7 Migrate FAQ to wiki, add guide links
REVERT: c9654abd5 1.1.1 - Improve calibration cycle (hope nothing breaks)
REVERT: f7991cbf7 Update FlipC link
REVERT: f7f453f88 1.1.0 - Text changes, nothing new
REVERT: e3651bde6 1.1.0 - Change nested folder name to .nested, remove .keys file after search, bug fixes
REVERT: 0c1373703 1.0.0 - Public release

git-subtree-dir: mifare_nested
git-subtree-split: 8dd6fc799e7b95b37cd7ac7daf450220fe422644

CHANGELOG.md

@@ -1,120 +0,0 @@
-# Changelog
-
-## 1.5.1
-
-Fix wrong invalid/skipped keys count
-
-## 1.5.0 
-
-Changes:
-
- - Added new scene with information about why nonces aren't collected (skipped/invalid)
-
- - Removed some old code, breaking compability with old firmware
-
- - App renamed from "Flipper (Mifare) Nested" to "Flipper Nested"
-
-
-## 1.4.6
-
-Fix fallback to hardnested 
-
-
-## 1.4.5 
-
-Fix .nested folder if running Hard Nested 
-
-
-## 1.4.4
-
-Fix skipped = false
-
-
-## 1.4.3
-
-Fix invalid free count
-
-
-## 1.4.2
-
-Minor code refactor
-
-
-## 1.4.1
-
-Fix invalid nonces after skipping 
-
-
-## 1.4.0
-
-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)
-
-
-## 1.3.0
-
-Check first_byte_sum (no more invalid ones) 
-
-
-## 1.2.5
-
-Add missing file
-
-
-## 1.2.4
-
-Missing free() on crypto1
-
-
-## 1.2.3
-
-Missing free()
-
-
-## 1.2.2
-
-Migrate to file_stream
-
-
-## 1.2.1
-
-Fix memory leaks 
-
-
-## 1.2.0
-
-Hard Nested attack 
-
-
-## 1.1.1
-
-Improve calibration cycle
-
-
-## 1.1.0
-
-Changes:
-
- - Change nested folder name to .nested
- 
- - Remove .keys file after search
- 
- - Bug fixes
-
-
-## 1.0.0
-
-Public release 

README.CATALOG.md

@@ -1,29 +0,0 @@
-# Mifare Nested Attacks for Flipper Zero
-
-Ported Nested attacks from Proxmark3 (Iceman fork)
-
-## Currently supported attacks
-
- - nested attack
- - static nested attack
- - hard nested attack
-
-## Warning
-
-App is still in early development, so there may be bugs. Your Flipper Zero may randomly crash/froze. Please create issue if you find any bugs (one bug = one issue).
-
-## Disclaimer
-
-The app provided for personal use only. Developer does not take responsibility for any loss or damage caused by the misuse of this app. In addition, the app developer does not guarantee the performance or compatibility of the app with all tags, and cannot be held liable for any damage caused to your tags/Flipper Zero as a result of using the app. By using this app you confirm that the tag belongs to you, you have permission to preform the attack and you agree to hold the app developer harmless from any and all claims, damages, or losses that may arise from its use.
-
-## How to use it?
-
-Detailed guide: https://github.com/AloneLiberty/FlipperNested/wiki/Usage-guide, RU: https://github.com/AloneLiberty/FlipperNested/wiki/%D0%93%D0%B0%D0%B9%D0%B4-%D0%BF%D0%BE-%D0%B8%D1%81%D0%BF%D0%BE%D0%BB%D1%8C%D0%B7%D0%BE%D0%B2%D0%B0%D0%BD%D0%B8%D1%8E
-
-## FAQ
-
-For frequently asked questions, please refer to the FAQ: https://github.com/AloneLiberty/FlipperNested/wiki/FAQ, RU: https://github.com/AloneLiberty/FlipperNested/wiki/%D0%A7%D0%90%D0%92%D0%9E
-
-## Contacts
-
-Telegram: https://t.me/libertydev

README.md

@@ -2,9 +2,8 @@
 
 Ported Nested attacks from Proxmark3 (Iceman fork)
 
-## Download
-
-[![FlipC.org](https://flipc.org/AloneLiberty/FlipperNested/badge?branch=dev)](https://flipc.org/AloneLiberty/FlipperNested?branch=dev)
+This is not original Repo of this app! Please follow this link to find latest original source and support the author!
+[Flipper (Mifare) Nested (by AloneLiberty)](https://github.com/AloneLiberty/FlipperNested)
 
 ## Currently supported attacks
 
@@ -14,7 +13,7 @@ Ported Nested attacks from Proxmark3 (Iceman fork)
 
 ## Warning
 
-App is still in early development, so there may be bugs. Your Flipper Zero may randomly crash/froze. Please create issue if you find any bugs (one bug = one issue).
+App is still in early development, so there may be bugs. Your Flipper Zero may randomly crash/froze. Please create issue if you find any bugs (one bug = one issue). In original repo! - https://github.com/AloneLiberty/FlipperNested
 
 ## Disclaimer
 
@@ -36,4 +35,4 @@ For frequently asked questions, please refer to the FAQ: [EN](https://github.com
 
 ## Contacts
 
-Telegram: [@libertydev](https://t.me/libertydev)
+Find here: https://github.com/AloneLiberty/FlipperNested

application.fam

@@ -1,6 +1,6 @@
 App(
     appid="mifare_nested",
-    name="Flipper Nested",
+    name="Mifare Nested",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="mifare_nested_app",
     requires=[

scenes/mifare_nested_scene_static_encrypted_nonce.c

@@ -1,58 +1,58 @@
-#include "../mifare_nested_i.h"
-
-void mifare_nested_scene_static_encrypted_nonce_widget_callback(
-    GuiButtonType result,
-    InputType type,
-    void* context) {
-    MifareNested* mifare_nested = context;
-    if(type == InputTypeShort) {
-        view_dispatcher_send_custom_event(mifare_nested->view_dispatcher, result);
-    }
-}
-
-void mifare_nested_scene_static_encrypted_nonce_on_enter(void* context) {
-    MifareNested* mifare_nested = context;
-    Widget* widget = mifare_nested->widget;
-
-    notification_message(mifare_nested->notifications, &sequence_error);
-
-    widget_add_icon_element(widget, 73, 12, &I_DolphinCry);
-    widget_add_string_element(
-        widget, 0, 0, AlignLeft, AlignTop, FontPrimary, "Static encrypted nonce");
-    widget_add_string_element(widget, 0, 12, AlignLeft, AlignTop, FontSecondary, "This tag isn't");
-    widget_add_string_element(widget, 0, 22, AlignLeft, AlignTop, FontSecondary, "vulnerable to");
-    widget_add_string_element(widget, 0, 32, AlignLeft, AlignTop, FontSecondary, "Nested attack");
-
-    widget_add_button_element(
-        widget,
-        GuiButtonTypeLeft,
-        "Back",
-        mifare_nested_scene_static_encrypted_nonce_widget_callback,
-        mifare_nested);
-
-    // Setup and start worker
-    view_dispatcher_switch_to_view(mifare_nested->view_dispatcher, MifareNestedViewWidget);
-}
-
-bool mifare_nested_scene_static_encrypted_nonce_on_event(void* context, SceneManagerEvent event) {
-    MifareNested* mifare_nested = context;
-    bool consumed = false;
-
-    if(event.type == SceneManagerEventTypeCustom) {
-        if(event.event == GuiButtonTypeCenter || event.event == GuiButtonTypeLeft) {
-            scene_manager_search_and_switch_to_previous_scene(mifare_nested->scene_manager, 0);
-            consumed = true;
-        }
-    } else if(event.type == SceneManagerEventTypeBack) {
-        scene_manager_search_and_switch_to_previous_scene(mifare_nested->scene_manager, 0);
-        consumed = true;
-    }
-
-    return consumed;
-}
-
-void mifare_nested_scene_static_encrypted_nonce_on_exit(void* context) {
-    MifareNested* mifare_nested = context;
-
-    widget_reset(mifare_nested->widget);
-}
+#include "../mifare_nested_i.h"
+
+void mifare_nested_scene_static_encrypted_nonce_widget_callback(
+    GuiButtonType result,
+    InputType type,
+    void* context) {
+    MifareNested* mifare_nested = context;
+    if(type == InputTypeShort) {
+        view_dispatcher_send_custom_event(mifare_nested->view_dispatcher, result);
+    }
+}
+
+void mifare_nested_scene_static_encrypted_nonce_on_enter(void* context) {
+    MifareNested* mifare_nested = context;
+    Widget* widget = mifare_nested->widget;
+
+    notification_message(mifare_nested->notifications, &sequence_error);
+
+    widget_add_icon_element(widget, 73, 12, &I_DolphinCry);
+    widget_add_string_element(
+        widget, 0, 0, AlignLeft, AlignTop, FontPrimary, "Static encrypted nonce");
+    widget_add_string_element(widget, 0, 12, AlignLeft, AlignTop, FontSecondary, "This tag isn't");
+    widget_add_string_element(widget, 0, 22, AlignLeft, AlignTop, FontSecondary, "vulnerable to");
+    widget_add_string_element(widget, 0, 32, AlignLeft, AlignTop, FontSecondary, "Nested attack");
+
+    widget_add_button_element(
+        widget,
+        GuiButtonTypeLeft,
+        "Back",
+        mifare_nested_scene_static_encrypted_nonce_widget_callback,
+        mifare_nested);
+
+    // Setup and start worker
+    view_dispatcher_switch_to_view(mifare_nested->view_dispatcher, MifareNestedViewWidget);
+}
+
+bool mifare_nested_scene_static_encrypted_nonce_on_event(void* context, SceneManagerEvent event) {
+    MifareNested* mifare_nested = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == GuiButtonTypeCenter || event.event == GuiButtonTypeLeft) {
+            scene_manager_search_and_switch_to_previous_scene(mifare_nested->scene_manager, 0);
+            consumed = true;
+        }
+    } else if(event.type == SceneManagerEventTypeBack) {
+        scene_manager_search_and_switch_to_previous_scene(mifare_nested->scene_manager, 0);
+        consumed = true;
+    }
+
+    return consumed;
+}
+
+void mifare_nested_scene_static_encrypted_nonce_on_exit(void* context) {
+    MifareNested* mifare_nested = context;
+
+    widget_reset(mifare_nested->widget);
+}