From 52bd4a1a3cb18896950ae39c299ac13d29c5e6dc Mon Sep 17 00:00:00 2001 From: rf-bandit <111388888+rf-bandit@users.noreply.github.com> Date: Sun, 13 Nov 2022 23:34:41 -0700 Subject: [PATCH 1/4] Add files via upload Adds sniffbt and sniffskim as option (ESP-32-WROOM) --- .../plugins/wifi_marauder_companion/wifi_marauder_app_i.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/applications/plugins/wifi_marauder_companion/wifi_marauder_app_i.h b/applications/plugins/wifi_marauder_companion/wifi_marauder_app_i.h index 63d340bbc..f571a11a2 100644 --- a/applications/plugins/wifi_marauder_companion/wifi_marauder_app_i.h +++ b/applications/plugins/wifi_marauder_companion/wifi_marauder_app_i.h @@ -1,3 +1,5 @@ +//** Includes sniffbt and sniffskim for compatible ESP32-WROOM hardware. +// wifi_marauder_scene_start.c also changed **// #pragma once #include "wifi_marauder_app.h" From 073a0942e85e3ed24aa7298a4a339f1cf9429a7a Mon Sep 17 00:00:00 2001 From: rf-bandit <111388888+rf-bandit@users.noreply.github.com> Date: Sun, 13 Nov 2022 23:38:10 -0700 Subject: [PATCH 2/4] Add files via upload Add sniffbt and sniffskim as menu option for ESP-32-WROOM --- .../scenes/wifi_marauder_scene_start.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c b/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c index a2dbf4b02..2829e4214 100644 --- a/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c +++ b/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c @@ -1,3 +1,5 @@ +//** Includes sniffbt and sniffskim for compatible ESP32-WROOM hardware. +//wifi_marauder_app_i.h also changed **// #include "../wifi_marauder_app_i.h" // For each command, define whether additional arguments are needed @@ -10,7 +12,7 @@ typedef enum { FOCUS_CONSOLE_END = 0, FOCUS_CONSOLE_START, FOCUS_CONSOLE_TOGGLE #define SHOW_STOPSCAN_TIP (true) #define NO_TIP (false) -#define MAX_OPTIONS (7) +#define MAX_OPTIONS (9) typedef struct { const char* item_string; const char* options_menu[MAX_OPTIONS]; @@ -56,9 +58,9 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = { FOCUS_CONSOLE_END, SHOW_STOPSCAN_TIP}, {"Sniff", - {"beacon", "deauth", "esp", "pmkid", "probe", "pwn", "raw"}, - 7, - {"sniffbeacon", "sniffdeauth", "sniffesp", "sniffpmkid", "sniffprobe", "sniffpwn", "sniffraw"}, + {"beacon", "deauth", "esp", "pmkid", "probe", "pwn", "raw", "bt", "cc"}, + 9, + {"sniffbeacon", "sniffdeauth", "sniffesp", "sniffpmkid", "sniffprobe", "sniffpwn", "sniffraw", "sniffbt", "sniffskim"}, NO_ARGS, FOCUS_CONSOLE_END, SHOW_STOPSCAN_TIP}, From eb3523b8e27c0ca9debfbd98ee243516240a6c2d Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Tue, 15 Nov 2022 04:22:43 +0300 Subject: [PATCH 3/4] Replace func naming to more correct one --- .../wifi_marauder_companion/scenes/wifi_marauder_scene_start.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c b/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c index 2829e4214..136f66f80 100644 --- a/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c +++ b/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c @@ -58,7 +58,7 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = { FOCUS_CONSOLE_END, SHOW_STOPSCAN_TIP}, {"Sniff", - {"beacon", "deauth", "esp", "pmkid", "probe", "pwn", "raw", "bt", "cc"}, + {"beacon", "deauth", "esp", "pmkid", "probe", "pwn", "raw", "bt", "skim"}, 9, {"sniffbeacon", "sniffdeauth", "sniffesp", "sniffpmkid", "sniffprobe", "sniffpwn", "sniffraw", "sniffbt", "sniffskim"}, NO_ARGS, From be97baef06a3e9c5374152b20e3f3a8e81e8ad9b Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Tue, 15 Nov 2022 04:42:54 +0300 Subject: [PATCH 4/4] Plugins: ibutton fuzzer improvements and rfid fuzzer too --- .../plugins/flipfrid/scene/flipfrid_scene_run_attack.c | 7 +++++-- .../ibtn_fuzzer/scene/ibtnfuzzer_scene_run_attack.c | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/applications/plugins/flipfrid/scene/flipfrid_scene_run_attack.c b/applications/plugins/flipfrid/scene/flipfrid_scene_run_attack.c index 890b5f384..5df0993cf 100644 --- a/applications/plugins/flipfrid/scene/flipfrid_scene_run_attack.c +++ b/applications/plugins/flipfrid/scene/flipfrid_scene_run_attack.c @@ -118,6 +118,7 @@ void flipfrid_scene_run_attack_on_tick(FlipFridState* context) { lfrfid_worker_stop(context->worker); lfrfid_worker_stop_thread(context->worker); context->workr_rund = false; + furi_delay_ms(200); } switch(context->attack) { case FlipFridAttackDefaultValues: @@ -515,7 +516,7 @@ void flipfrid_scene_run_attack_on_event(FlipFridEvent event, FlipFridState* cont break; case InputKeyLeft: if(!context->is_attacking) { - if(context->time_between_cards > 0) { + if(context->time_between_cards > 5) { context->time_between_cards--; } } @@ -562,7 +563,9 @@ void flipfrid_scene_run_attack_on_event(FlipFridEvent event, FlipFridState* cont case InputKeyLeft: if(!context->is_attacking) { if(context->time_between_cards > 0) { - context->time_between_cards -= 10; + if((context->time_between_cards - 10) > 5) { + context->time_between_cards -= 10; + } } } break; diff --git a/applications/plugins/ibtn_fuzzer/scene/ibtnfuzzer_scene_run_attack.c b/applications/plugins/ibtn_fuzzer/scene/ibtnfuzzer_scene_run_attack.c index 55942f929..5efd4f052 100644 --- a/applications/plugins/ibtn_fuzzer/scene/ibtnfuzzer_scene_run_attack.c +++ b/applications/plugins/ibtn_fuzzer/scene/ibtnfuzzer_scene_run_attack.c @@ -108,6 +108,7 @@ void ibtnfuzzer_scene_run_attack_on_tick(iBtnFuzzerState* context) { ibutton_worker_stop(context->worker); ibutton_worker_stop_thread(context->worker); context->workr_rund = false; + furi_delay_ms(500); } switch(context->attack) { case iBtnFuzzerAttackDefaultValues: @@ -361,7 +362,7 @@ void ibtnfuzzer_scene_run_attack_on_event(iBtnFuzzerEvent event, iBtnFuzzerState break; case InputKeyLeft: if(!context->is_attacking) { - if(context->time_between_cards > 0) { + if(context->time_between_cards > 8) { context->time_between_cards--; } } @@ -407,8 +408,10 @@ void ibtnfuzzer_scene_run_attack_on_event(iBtnFuzzerEvent event, iBtnFuzzerState switch(event.key) { case InputKeyLeft: if(!context->is_attacking) { - if(context->time_between_cards > 0) { - context->time_between_cards -= 10; + if(context->time_between_cards > 8) { + if((context->time_between_cards - 10) > 8) { + context->time_between_cards -= 10; + } } } break;