Upd Multi Fuzzer

ReadMe.md

@@ -82,6 +82,8 @@ This software is for experimental purposes only and is not meant for any illegal
 - OFW: [SubGhz: fix check connect cc1101_ext #2857 (By Skorpionm)](https://github.com/flipperdevices/flipperzero-firmware/pull/2857)
 - OFW: [NFC: Improved MFC emulation on some readers #2825 (By AloneLiberty)](https://github.com/flipperdevices/flipperzero-firmware/pull/2825)
 - OFW: [Dolphin: add new animation #2865 (By skotopes)](https://github.com/flipperdevices/flipperzero-firmware/pull/2865)
+- Updated: [iButton Fuzzer (By gid9798)](https://github.com/DarkFlippers/unleashed-firmware/pull/507)
+- Updated: [RFID Fuzzer (By gid9798)](https://github.com/DarkFlippers/unleashed-firmware/pull/507)
 
 <a name="release">
 

applications/external/multi_fuzzer/CHANGELOG.md

@@ -0,0 +1,25 @@
+## v1.1
+- Improved pause during attack
+    - Added the ability to switch UID
+    - Added the ability to emulate the current UID
+    - Added the ability to save UID
+- Load key file attack
+    - Key file loading now does not depend on the selected protocol
+
+## v1.0
+
+**Supported protocols**
+| iButton | RFID        |
+|:-:      | :-:         |
+| DS1990  | EM4100      |
+| Metakom | HIDProx     |
+| Cyfral  | PAC/Stanley |
+|         | H10301      |
+
+**Suported attack**
+|                     | iButton | RFID |
+| -                   | :-:     | :-:  |
+| Default Values      | +       | +    |
+| Load key file       | +       | +    |
+| Load UIDs from file | +       | +    |
+| BFCustomer ID       | -       | +    |

applications/external/multi_fuzzer/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 @gid9798 @xMasterX @G4N4P4T1
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

applications/external/multi_fuzzer/README.md

@@ -0,0 +1,40 @@
+## Multi Fuzzer
+### Flipper Zero app for checking ibutton and RFID<sub>(125khz)</sub> readers .
+
+**Not meant for any illegal activity/purposes.**
+
+You can check your readers for vulnerabilities using the default UIDs and frequently used UIDs.
+
+The application will also help to identify the "denial of service" vulnerability when providing an incorrect uid or when accessing the reader too often.
+
+This is a completely remade app, visual style inspired by [iButton fuzzer](https://github.com/DarkFlippers/unleashed-firmware/tree/58338ff51f6f9857f39ef07d5eb4495cdc02290d/applications/external/ibtn_fuzzer), the compatibility of user dictionaries is also preserved
+
+## Supported protocols
+
+### **iButton**
+- DS1990 (Dallas)
+- Metakom
+- Cyfral
+
+### **LFRFID**
+- EM4100
+- HIDProx
+- PAC/Stanley
+- H10301
+
+## Application Features
+### Main screen
+- **Header** - selected protocol
+- **Menu** - available attacks
+    - **Default Values** - Using the dictionary from the app
+    - **Load UIDs from file** - Loading a custom dictionary from an SD card
+    - **Load file** - Loading UID from ***FlipperFormat*** key file with the ability to edit and further iterate over the selected byte
+    - **BFCustomer ID** - Iterates over the selected byte with the remaining bytes equal to zero
+
+### Attack screen
+- **Header** - selected attack
+- **2nd line**
+    - **Time delay (TD)** - idle time between UID submissions
+    - **Emulation time (EmT)** - transmission time of one UID
+- **3rd line** - Prtocol name
+- **4th line** - Current UID

applications/external/multi_fuzzer/application.fam

@@ -13,7 +13,8 @@ App(
     stack_size=2 * 1024,
     fap_author="gid9798 xMasterX",
     fap_weburl="https://github.com/DarkFlippers/Multi_Fuzzer",
-    # fap_version="1.0.0",
+    # fap_version="1.1",
+    targets=["f7"],
     fap_description="Fuzzer for ibutton readers",
     fap_icon="icons/ibutt_10px.png",
     fap_category="iButton",
@@ -42,7 +43,8 @@ App(
     stack_size=2 * 1024,
     fap_author="gid9798 xMasterX",
     fap_weburl="https://github.com/DarkFlippers/Multi_Fuzzer",
-    # fap_version="1.0.0",
+    # fap_version="1.1",
+    targets=["f7"],
     fap_description="Fuzzer for lfrfid readers",
     fap_icon="icons/rfid_10px.png",
     fap_category="RFID",

applications/external/multi_fuzzer/catalog/docs/ibtn/Changelog.md

@@ -0,0 +1,19 @@
+## v1.1
+- Improved pause during attack
+    - Added the ability to switch UID
+    - Added the ability to emulate the current UID
+    - Added the ability to save UID
+- Load key file attack
+    - Key file loading now does not depend on the selected protocol
+
+## v1.0
+
+**Supported protocols**
+- DS1990 (Dallas)
+- Metakom
+- Cyfral
+
+**Suported attack**
+- Default Values
+- Load key file
+- Load UIDs from file

applications/external/multi_fuzzer/catalog/docs/ibtn/README.md

@@ -0,0 +1,29 @@
+# Multi Fuzzer
+## Flipper Zero app for checking ibutton readers .
+
+**Not meant for any illegal activity/purposes.**
+
+You can check your readers for vulnerabilities using the default UIDs and frequently used UIDs.
+
+The application will also help to identify the "denial of service" vulnerability when providing an incorrect uid or when accessing the reader too often.
+
+## Supported protocols
+- DS1990 (Dallas)
+- Metakom
+- Cyfral
+
+# Application Features
+## Main screen
+- **Header** - selected protocol
+- **Menu** - available attacks
+    - **Default Values** - Using the dictionary from the app
+    - **Load UIDs from file** - Loading a custom dictionary from an SD card
+    - **Load file** - Loading UID from ***FlipperFormat*** key file with the ability to edit and further iterate over the selected byte
+
+## Attack screen
+- **Header** - selected attack
+- **2nd line**
+    - **Time delay (TD)** - idle time between UID submissions
+    - **Emulation time (EmT)** - transmission time of one UID
+- **3rd line** - Prtocol name
+- **4th line** - Current UID

applications/external/multi_fuzzer/catalog/docs/rfid/Changelog.md

@@ -0,0 +1,21 @@
+## v1.1
+- Improved pause during attack
+    - Added the ability to switch UID
+    - Added the ability to emulate the current UID
+    - Added the ability to save UID
+- Load key file attack
+    - Key file loading now does not depend on the selected protocol
+
+## v1.0
+
+**Supported protocols**
+- EM4100
+- HIDProx
+- PAC/Stanley
+- H10301
+
+**Suported attack**
+- Default Values
+- Load key file
+- Load UIDs from file
+- BFCustomer ID

applications/external/multi_fuzzer/catalog/docs/rfid/README.md

@@ -0,0 +1,31 @@
+# Multi Fuzzer
+## Flipper Zero app for checking LF RFID readers .
+
+**Not meant for any illegal activity/purposes.**
+
+You can check your readers for vulnerabilities using the default UIDs and frequently used UIDs.
+
+The application will also help to identify the "denial of service" vulnerability when providing an incorrect uid or when accessing the reader too often.
+
+## Supported protocols
+- EM4100
+- HIDProx
+- PAC/Stanley
+- H10301
+
+# Application Features
+## Main screen
+- **Header** - selected protocol
+- **Menu** - available attacks
+    - **Default Values** - Using the dictionary from the app
+    - **Load UIDs from file** - Loading a custom dictionary from an SD card
+    - **Load file** - Loading UID from ***FlipperFormat*** key file with the ability to edit and further iterate over the selected byte
+    - **BFCustomer ID** - Iterates over the selected byte with the remaining bytes equal to zero
+
+## Attack screen
+- **Header** - selected attack
+- **2nd line**
+    - **Time delay (TD)** - idle time between UID submissions
+    - **Emulation time (EmT)** - transmission time of one UID
+- **3rd line** - Prtocol name
+- **4th line** - Current UID

applications/external/multi_fuzzer/fuzzer.c

@@ -46,6 +46,11 @@ PacsFuzzerApp* fuzzer_app_alloc() {
     app->popup = popup_alloc();
     view_dispatcher_add_view(app->view_dispatcher, FuzzerViewIDPopup, popup_get_view(app->popup));
 
+    // TextInput
+    app->text_input = text_input_alloc();
+    view_dispatcher_add_view(
+        app->view_dispatcher, FuzzerViewIDTextInput, text_input_get_view(app->text_input));
+
     // Main view
     app->main_view = fuzzer_view_main_alloc();
     view_dispatcher_add_view(
@@ -100,6 +105,10 @@ void fuzzer_app_free(PacsFuzzerApp* app) {
     view_dispatcher_remove_view(app->view_dispatcher, FuzzerViewIDPopup);
     popup_free(app->popup);
 
+    // TextInput
+    view_dispatcher_remove_view(app->view_dispatcher, FuzzerViewIDTextInput);
+    text_input_free(app->text_input);
+
     scene_manager_free(app->scene_manager);
     view_dispatcher_free(app->view_dispatcher);
 
@@ -126,10 +135,10 @@ int32_t fuzzer_start_ibtn(void* p) {
     PacsFuzzerApp* fuzzer_app = fuzzer_app_alloc();
 
     FuzzerConsts app_const = {
-        .custom_dict_folder = EXT_PATH("ibutton/ibtnfuzzer"),
+        .custom_dict_folder = "/ext/ibutton/ibtnfuzzer",
         .custom_dict_extension = ".txt",
         .key_extension = ".ibtn",
-        .path_key_folder = EXT_PATH("ibutton"),
+        .path_key_folder = "/ext/ibutton",
         .key_icon = &I_ibutt_10px,
     };
     fuzzer_app->fuzzer_const = &app_const;
@@ -145,10 +154,10 @@ int32_t fuzzer_start_rfid(void* p) {
     PacsFuzzerApp* fuzzer_app = fuzzer_app_alloc();
 
     FuzzerConsts app_const = {
-        .custom_dict_folder = EXT_PATH("lfrfid/rfidfuzzer"),
+        .custom_dict_folder = "/ext/lfrfid/rfidfuzzer",
         .custom_dict_extension = ".txt",
         .key_extension = ".rfid",
-        .path_key_folder = EXT_PATH("lfrfid"),
+        .path_key_folder = "/ext/lfrfid",
         .key_icon = &I_125_10px,
     };
     fuzzer_app->fuzzer_const = &app_const;

applications/external/multi_fuzzer/fuzzer_i.h

@@ -7,6 +7,7 @@
 #include <gui/view_dispatcher.h>
 #include <gui/scene_manager.h>
 #include <gui/modules/popup.h>
+#include <gui/modules/text_input.h>
 
 #include <dialogs/dialogs.h>
 #include <notification/notification_messages.h>
@@ -23,6 +24,7 @@
 #include "fuzzer_icons.h"
 
 #define FUZZ_TIME_DELAY_MAX (80)
+#define KEY_NAME_SIZE 22
 
 typedef struct {
     const char* custom_dict_extension;
@@ -41,11 +43,13 @@ typedef struct {
 
     Popup* popup;
     DialogsApp* dialogs;
+    TextInput* text_input;
     FuzzerViewMain* main_view;
     FuzzerViewAttack* attack_view;
     FuzzerViewFieldEditor* field_editor_view;
 
     FuriString* file_path;
+    char key_name[KEY_NAME_SIZE + 1];
 
     FuzzerState fuzzer_state;
     FuzzerConsts* fuzzer_const;

applications/external/multi_fuzzer/helpers/fuzzer_custom_event.h

@@ -7,11 +7,21 @@ typedef enum {
     FuzzerCustomEventViewMainOk,
     FuzzerCustomEventViewMainPopupErr,
 
-    FuzzerCustomEventViewAttackBack,
-    FuzzerCustomEventViewAttackOk,
-    // FuzzerCustomEventViewAttackTick, // now not use
     FuzzerCustomEventViewAttackEnd,
 
+    FuzzerCustomEventViewAttackExit,
+    FuzzerCustomEventViewAttackRunAttack,
+    FuzzerCustomEventViewAttackPause,
+    FuzzerCustomEventViewAttackIdle, // Setup
+    FuzzerCustomEventViewAttackEmulateCurrent,
+    FuzzerCustomEventViewAttackSave,
+    FuzzerCustomEventViewAttackNextUid,
+    FuzzerCustomEventViewAttackPrevUid,
+
     FuzzerCustomEventViewFieldEditorBack,
     FuzzerCustomEventViewFieldEditorOk,
+
+    FuzzerCustomEventTextEditResult,
+
+    FuzzerCustomEventPopupClosed,
 } FuzzerCustomEvent;

applications/external/multi_fuzzer/helpers/fuzzer_types.h

@@ -10,7 +10,9 @@ typedef struct {
 typedef enum {
     FuzzerAttackStateOff = 0,
     FuzzerAttackStateIdle,
-    FuzzerAttackStateRunning,
+    FuzzerAttackStateAttacking,
+    FuzzerAttackStateEmulating,
+    FuzzerAttackStatePause,
     FuzzerAttackStateEnd,
 
 } FuzzerAttackState;
@@ -23,6 +25,7 @@ typedef enum {
 
 typedef enum {
     FuzzerViewIDPopup,
+    FuzzerViewIDTextInput,
 
     FuzzerViewIDMain,
     FuzzerViewIDAttack,