From 1115a0b877c656362afc383d417ae63732c82eb4 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sat, 29 Oct 2022 15:45:51 +0300
Subject: [PATCH 1/4] fix subghz bruteforcer

---
 applications/plugins/subbrute | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/plugins/subbrute b/applications/plugins/subbrute
index 06da82fb0..e5eb466c5 160000
--- a/applications/plugins/subbrute
+++ b/applications/plugins/subbrute
@@ -1 +1 @@
-Subproject commit 06da82fb08f675458aec7bfa92fe133711c559bf
+Subproject commit e5eb466c557fe35564d3f69cad9481bf43e71437

From 5319c69e59b95223c55ec4357b84556211158f42 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sat, 29 Oct 2022 15:48:26 +0300
Subject: [PATCH 2/4] update changelog

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index faf159d4c..dbac80eb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
 ### New changes
+* Fix SubGHz Bruteforcer crash and implement support for new protocols in BF existing dump (@xMasterX)
+### Previous changes
 * Fixed TOTP (Authenticator) - downgraded to 1.1.0
 * Fixed i2cTools menu bug
-### Previous changes
-* API version changed to 8.2 due to OFW updates, Extra apps pack update is already done! Download it from link below
+* API version changed to 8.2 due to OFW updates, **Download extra pack update only if your unleashed version was lower than 009!!!**
 * Added Infrared API for .fap's
 * **OFW: Mf Classic initial write, update, detect reader (when card has not readed keys/sectors you can use it as simulation for detect reader)**
 * OFW: New Keeloq magic serial type 2, 3

From 328fcdd92408e56afb68110f6f79629e9aa35684 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sat, 29 Oct 2022 16:09:28 +0300
Subject: [PATCH 3/4] update chlog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbac80eb1..66a4a3f37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### New changes
 * Fix SubGHz Bruteforcer crash and implement support for new protocols in BF existing dump (@xMasterX)
+* PR: Wifi Marauder: make "add random" not overlap > symbol (by @TQMatvey | PR #141)
 ### Previous changes
 * Fixed TOTP (Authenticator) - downgraded to 1.1.0
 * Fixed i2cTools menu bug

From 8e4595e4f7f2a4387f2a6f67d88b071970236893 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sat, 29 Oct 2022 17:21:30 +0300
Subject: [PATCH 4/4] fix nfc worker merge issues

---
 lib/nfc/nfc_worker.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/lib/nfc/nfc_worker.c b/lib/nfc/nfc_worker.c
index dfc9e1b42..e1e379a06 100644
--- a/lib/nfc/nfc_worker.c
+++ b/lib/nfc/nfc_worker.c
@@ -566,18 +566,6 @@ void nfc_worker_mf_classic_dict_attack(NfcWorker* nfc_worker) {
         return;
     }
 
-    // Clear found keys if the key cache is incorrect (key set as found but sector not read)
-    for(uint16_t sector = 0; sector < total_sectors; sector++) {
-        if(mf_classic_is_key_found(data, sector, MfClassicKeyA) &&
-           !mf_classic_is_sector_read(data, sector)) {
-            mf_classic_set_key_not_found(data, sector, MfClassicKeyA);
-        }
-        if(mf_classic_is_key_found(data, sector, MfClassicKeyB) &&
-           !mf_classic_is_sector_read(data, sector)) {
-            mf_classic_set_key_not_found(data, sector, MfClassicKeyB);
-        }
-    }
-
     FURI_LOG_D(
         TAG, "Start Dictionary attack, Key Count %ld", mf_classic_dict_get_total_keys(dict));
     for(size_t i = 0; i < total_sectors; i++) {
@@ -906,6 +894,7 @@ static void nfc_worker_reader_analyzer_callback(ReaderAnalyzerEvent event, void*
 }
 
 void nfc_worker_analyze_reader(NfcWorker* nfc_worker) {
+    furi_assert(nfc_worker);
     furi_assert(nfc_worker->callback);
 
     FuriHalNfcTxRxContext tx_rx = {};