Merge branch 'dev' into release

DarkFlippers · Apr 27, 2023 · 98bf353 · 98bf353
2 parents eb8c751 + d85e097
commit 98bf353
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,12 +11,14 @@
 * Plugins: Update **ESP32: WiFi Marauder companion** plugin [(by 0xchocolate)](https://github.com/0xchocolate/flipperzero-firmware-with-wifi-marauder-companion) merged [PR by @tcpassos](https://github.com/0xchocolate/flipperzero-firmware-with-wifi-marauder-companion/pull/11)
 * Plugins: Update **TOTP (Authenticator)** [(by akopachov)](https://github.com/akopachov/flipper-zero_authenticator)
 * Plugins: Fix RFID Fuzzer and iButton Fuzzer crashes
+* Plugins: iButton Fuzzer default keys update (by @team-orangeBlue)
 * Infrared: Updated infrared assets (by @amec0e | PR #441)
 * Docs: Update **How To Install** images (by @krolchonok | PR #436)
 * OFW PR 2620: NFC: Fix reading Mifare Classic cards with unusual access conditions and fix emulation of unknown keys (by Astrrra)
 * OFW PR 2616: Picopass: remove spaces in CSN (by bettse)
 * OFW PR 2604: WS: add protocol "Wendox W6726" (by Skorpionm)
 * OFW PR 2607: BadUSB: command parser fix (by nminaylov)
+* OFW: Keep HSI16 working in stop mode.
 * OFW: FuriHal: use proper divider for core2 when transition to sleep, remove extra stop mode transition checks, cleanup code. Furi: proper assert and check messages.
 * OFW: Don't reboot on crash in debug builds
 * OFW: cubewb: downgraded to v1.15.0 

diff --git a/applications/external/ibtn_fuzzer/scene/ibtnfuzzer_scene_run_attack.c b/applications/external/ibtn_fuzzer/scene/ibtnfuzzer_scene_run_attack.c
@@ -3,7 +3,7 @@
 
 uint8_t counter = 0;
 
-uint8_t id_list_ds1990[25][8] = {
+uint8_t id_list_ds1990[18][8] = {
     {0x01, 0xBE, 0x40, 0x11, 0x5A, 0x36, 0x00, 0xE1}, //– код универсального ключа, для Vizit
     {0x01, 0xBE, 0x40, 0x11, 0x5A, 0x56, 0x00, 0xBB}, //- проверен работает
     {0x01, 0xBE, 0x40, 0x11, 0x00, 0x00, 0x00, 0x77}, //- проверен работает
@@ -19,16 +19,9 @@ uint8_t id_list_ds1990[25][8] = {
     {0x01, 0x00, 0xBE, 0x11, 0xAA, 0x00, 0x00, 0xFB}, //???-домофоны Кейман (KEYMAN)
     {0x01, 0x76, 0xB8, 0x2E, 0x0F, 0x00, 0x00, 0x5C}, //???-домофоны Форвард
     {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // Null bytes
-    {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, // Only FF
-    {0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11}, // Only 11
-    {0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22}, // Only 22
-    {0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33}, // Only 33
-    {0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44}, // Only 44
-    {0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55}, // Only 55
-    {0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66}, // Only 66
-    {0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77}, // Only 77
-    {0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88}, // Only 88
-    {0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99}, // Only 99
+    {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x14}, // Only FF
+    {0x01, 0x78, 0x00, 0x48, 0xFD, 0xFF, 0xFF, 0xD1}, // StarNew Uni5
+    {0x01, 0xA9, 0xE4, 0x3C, 0x09, 0x00, 0x00, 0xE6}, // Eltis Uni
 };
 
 uint8_t id_list_metakom[17][4] = {
@@ -51,7 +44,7 @@ uint8_t id_list_metakom[17][4] = {
     {0xCA, 0xCA, 0xCA, 0xCA}, // ??
 };
 
-uint8_t id_list_cyfral[14][2] = {
+uint8_t id_list_cyfral[16][2] = {
     {0x00, 0x00}, // Null bytes
     {0xFF, 0xFF}, // Only FF
     {0x11, 0x11}, // Only 11
@@ -66,6 +59,8 @@ uint8_t id_list_cyfral[14][2] = {
     {0x12, 0x34}, // Incremental UID
     {0x56, 0x34}, // Decremental UID
     {0xCA, 0xCA}, // ??
+    {0x8E, 0xC9}, // Elevator code
+    {0x6A, 0x50}, // VERY fresh code from smartkey
 };
 
 void ibtnfuzzer_scene_run_attack_on_enter(iBtnFuzzerState* context) {
@@ -130,7 +125,7 @@ void ibtnfuzzer_scene_run_attack_on_tick(iBtnFuzzerState* context) {
                     context->payload[6] = id_list_ds1990[context->attack_step][6];
                     context->payload[7] = id_list_ds1990[context->attack_step][7];
 
-                    if(context->attack_step == 24) {
+                    if(context->attack_step == 17) {
                         context->attack_step = 0;
                         counter = 0;
                         context->is_attacking = false;
@@ -160,7 +155,7 @@ void ibtnfuzzer_scene_run_attack_on_tick(iBtnFuzzerState* context) {
                     context->payload[0] = id_list_cyfral[context->attack_step][0];
                     context->payload[1] = id_list_cyfral[context->attack_step][1];
 
-                    if(context->attack_step == 13) {
+                    if(context->attack_step == 15) {
                         context->attack_step = 0;
                         counter = 0;
                         context->is_attacking = false;