Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RFID: 3 new T5577 extra actions: Set/clear custom pw; write block; wipe #678

Merged
merged 1 commit into from
Jun 26, 2023
Merged

RFID: 3 new T5577 extra actions: Set/clear custom pw; write block; wipe #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 32 additions & 0 deletions applications/main/lfrfid/helpers/lfrfid_dialog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#include "../lfrfid_i.h"
#include <dialogs/dialogs.h>
#include "lfrfid_dialog.h"

void lfrfid_alert_dialog(void* context, char* text) {
LfRfid *app = context;

DialogMessage* message = dialog_message_alloc();
dialog_message_set_header(message, "Alert!", 0, 0, AlignLeft, AlignTop);
dialog_message_set_buttons(message, NULL, NULL, NULL);
dialog_message_set_text(message, text, SCREEN_WIDTH_CENTER,
SCREEN_HEIGHT_CENTER, AlignCenter, AlignCenter);
DialogMessageButton dialog_result = dialog_message_show(app->dialogs, message);
dialog_message_free(message);
if (dialog_result == DialogMessageButtonRight)
;
return;
}

DialogMessageButton lfrfid_message_dialog(void* context, char* header, char* text, char* button_left, char* button_center, char* button_right) {
LfRfid *app = context;

DialogMessage* message = dialog_message_alloc();
dialog_message_set_header(message, header, 0, 0, AlignLeft, AlignTop);
dialog_message_set_buttons(message, button_left, button_center, button_right);
dialog_message_set_text(message, text, SCREEN_WIDTH_CENTER,
SCREEN_HEIGHT_CENTER, AlignCenter, AlignCenter);
DialogMessageButton dialog_result = dialog_message_show(app->dialogs, message);
dialog_message_free(message);

return dialog_result;
}
4 changes: 4 additions & 0 deletions applications/main/lfrfid/helpers/lfrfid_dialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

void lfrfid_alert_dialog(void* context, char* text);

DialogMessageButton lfrfid_message_dialog(void* context, char* header, char* text, char* button_left, char* button_center, char* button_right);
9 changes: 9 additions & 0 deletions applications/main/lfrfid/scenes/lfrfid_scene_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ ADD_SCENE(lfrfid, save_type, SaveType)
ADD_SCENE(lfrfid, saved_info, SavedInfo)
ADD_SCENE(lfrfid, clear_t5577, ClearT5577)
ADD_SCENE(lfrfid, clear_t5577_confirm, ClearT5577Confirm)
ADD_SCENE(lfrfid, setpw_t5577, SetPwT5577)
ADD_SCENE(lfrfid, setpw_t5577_confirm, SetPwT5577Confirm)
ADD_SCENE(lfrfid, write_block_t5577, WriteBlockT5577)
ADD_SCENE(lfrfid, write_block_t5577_confirm, WriteBlockT5577Confirm)
ADD_SCENE(lfrfid, enter_hex, EnterHex)
//ADD_SCENE(lfrfid, read_block_t5577, ReadBlockT5577)
//ADD_SCENE(lfrfid, read_block_t5577_confirm, ReadBlockT5577Confirm)
ADD_SCENE(lfrfid, wipe_t5577, WipeT5577)
ADD_SCENE(lfrfid, wipe_t5577_confirm, WipeT5577Confirm)
ADD_SCENE(lfrfid, delete_success, DeleteSuccess)
ADD_SCENE(lfrfid, extra_actions, ExtraActions)
ADD_SCENE(lfrfid, raw_info, RawInfo)
Expand Down
63 changes: 63 additions & 0 deletions applications/main/lfrfid/scenes/lfrfid_scene_enter_hex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
#include "../lfrfid_i.h"

void lfrfid_scene_enter_hex_on_enter(void* context) {
LfRfid* app = context;
ByteInput* byte_input = app->byte_input;

size_t size = sizeof(uint32_t);

if (app->setting_hex == LfRfidSettingCurrentPassword)
byte_input_set_header_text(byte_input, "Enter the current pw in hex");
else if (app->setting_hex == LfRfidSettingNewPassword)
byte_input_set_header_text(byte_input, "Enter the new password in hex");
else // LfRfidSettingHexGeneric
byte_input_set_header_text(byte_input, "Enter the block data in hex");

uint8_t * bytes;
if (app->setting_hex == LfRfidSettingCurrentPassword)
bytes = app->password;
else if (app->setting_hex == LfRfidSettingNewPassword)
bytes = app->new_password;
else // LfRfidSettingHexGeneric
bytes = app->new_key_data;
byte_input_set_result_callback(
byte_input, lfrfid_text_input_callback, NULL, app, bytes, size);

view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewByteInput);
}

bool lfrfid_scene_enter_hex_on_event(void* context, SceneManagerEvent event) {
LfRfid* app = context;
SceneManager* scene_manager = app->scene_manager;
bool consumed = false;

if(event.type == SceneManagerEventTypeCustom) {
if(event.event == LfRfidEventNext) {
consumed = true;
/* if (app->extra_options & LfRfidReadBlockMode) {
scene_manager_next_scene(scene_manager, LfRfidSceneReadBlockT5577Confirm);
} else */ if (app->extra_options & LfRfidWriteBlockMode) {
if (app->setting_hex == LfRfidSettingCurrentPassword) {
app->setting_hex = LfRfidSettingHexGeneric;
scene_manager_next_scene(scene_manager, LfRfidSceneEnterHex);
} else
scene_manager_next_scene(scene_manager, LfRfidSceneWriteBlockT5577Confirm);
} else {
if ((app->setting_hex == LfRfidSettingCurrentPassword) &&
!(app->extra_options & LfRfidDisablePasswordMode)) {
app->setting_hex = LfRfidSettingNewPassword;
scene_manager_next_scene(scene_manager, LfRfidSceneEnterHex);
} else
scene_manager_next_scene(scene_manager, LfRfidSceneSetPwT5577Confirm);
}
}
} else if(event.type == SceneManagerEventTypeBack) {
scene_manager_next_scene(scene_manager, LfRfidSceneExtraActions);
}

return consumed;
}

void lfrfid_scene_enter_hex_on_exit(void* context) {
UNUSED(context);
}
108 changes: 107 additions & 1 deletion applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
#include "../lfrfid_i.h"
#include <dolphin/dolphin.h>
#include <dialogs/dialogs.h>

typedef enum {
SubmenuIndexASK,
SubmenuIndexPSK,
SubmenuIndexClearT5577,
SubmenuIndexSetPwT5577,
//SubmenuIndexReadBlockT5577, //FIX
SubmenuIndexWriteBlockT5577,
SubmenuIndexWipeT5577,
// SubmenuIndexHitag,
SubmenuIndexRAW,
SubmenuIndexRAWEmulate,
Expand Down Expand Up @@ -38,6 +43,30 @@ void lfrfid_scene_extra_actions_on_enter(void* context) {
SubmenuIndexClearT5577,
lfrfid_scene_extra_actions_submenu_callback,
app);
submenu_add_item(
submenu,
"Set/clear T5577 Cust.Pw",
SubmenuIndexSetPwT5577,
lfrfid_scene_extra_actions_submenu_callback,
app);
submenu_add_item(
submenu,
"Write T5577 Block",
SubmenuIndexWriteBlockT5577,
lfrfid_scene_extra_actions_submenu_callback,
app);
// submenu_add_item(
// submenu,
// "Read T5577 Block",
// SubmenuIndexReadBlockT5577,
// lfrfid_scene_extra_actions_submenu_callback,
// app);
submenu_add_item(
submenu,
"Wipe T5577",
SubmenuIndexWipeT5577,
lfrfid_scene_extra_actions_submenu_callback,
app);
// submenu_add_item(
// submenu,
// "Read RTF (Reader Talks First)",
Expand Down Expand Up @@ -70,6 +99,7 @@ void lfrfid_scene_extra_actions_on_enter(void* context) {

bool lfrfid_scene_extra_actions_on_event(void* context, SceneManagerEvent event) {
LfRfid* app = context;
SceneManager* scene_manager = app->scene_manager;
bool consumed = false;

if(event.type == SceneManagerEventTypeCustom) {
Expand All @@ -86,7 +116,83 @@ bool lfrfid_scene_extra_actions_on_event(void* context, SceneManagerEvent event)
} else if(event.event == SubmenuIndexClearT5577) {
scene_manager_next_scene(app->scene_manager, LfRfidSceneClearT5577Confirm);
consumed = true;
// } else if(event.event == SubmenuIndexHitag) {

} else if(event.event == SubmenuIndexSetPwT5577) {
app->extra_options = 0;
DialogMessage* message = dialog_message_alloc();
dialog_message_set_header(message, "T5577 access", 0, 0, AlignLeft, AlignTop);
dialog_message_set_buttons(message, "Clear", NULL, "Set");
dialog_message_set_text(message, "Clear or set password?",
SCREEN_WIDTH_CENTER, SCREEN_HEIGHT_CENTER, AlignCenter, AlignCenter);
DialogMessageButton dialog_result = dialog_message_show(app->dialogs, message);
dialog_message_free(message);
if (dialog_result == DialogMessageButtonLeft) { //clear pw
memset(app->new_password, 0, 4);
app->extra_options |= LfRfidUsePassword;
app->extra_options |= LfRfidDisablePasswordMode;
app->setting_hex = LfRfidSettingCurrentPassword;
scene_manager_next_scene(scene_manager, LfRfidSceneEnterHex);
} else { // set password
memset(app->password, 0, 4);
app->setting_hex = LfRfidSettingNewPassword;
scene_manager_next_scene(scene_manager, LfRfidSceneEnterHex);
}
consumed = true;
} else if(event.event == SubmenuIndexWriteBlockT5577) {
app->extra_options = 0;
app->extra_options |= LfRfidWriteBlockMode;
DialogMessage* message = dialog_message_alloc();
dialog_message_set_header(message, "T5577 access", 0, 0, AlignLeft, AlignTop);
dialog_message_set_buttons(message, "No", NULL, "Yes");
dialog_message_set_text(message, "Is tag password protected?",
SCREEN_WIDTH_CENTER, SCREEN_HEIGHT_CENTER, AlignCenter, AlignCenter);
DialogMessageButton dialog_result = dialog_message_show(app->dialogs, message);
dialog_message_free(message);
if (dialog_result == DialogMessageButtonRight) {
app->extra_options |= LfRfidUsePassword;
app->setting_hex = LfRfidSettingCurrentPassword;
scene_manager_next_scene(scene_manager, LfRfidSceneEnterHex);
} else {
memset(app->password, 0, 4);
app->setting_hex = LfRfidSettingHexGeneric;
scene_manager_next_scene(scene_manager, LfRfidSceneEnterHex);
}
consumed = true;
//} else if(event.event == SubmenuIndexReadBlockT5577) {
// FIX, doesn't work, needs at lest new generic protocol
// app->extra_options = 0;
// app->extra_options |= LfRfidReadBlockMode;
// DialogMessage* message = dialog_message_alloc();
// dialog_message_set_header(message, "T5577 access", 0, 0, AlignLeft,
// AlignTop);
// dialog_message_set_buttons(message, "No", NULL, "Yes");
// dialog_message_set_text(message, "Is tag password protected?",
// SCREEN_WIDTH_CENTER, SCREEN_HEIGHT_CENTER, AlignCenter, AlignCenter);
// DialogMessageButton dialog_result = dialog_message_show(app->dialogs, message);
// dialog_message_free(message);
// if (dialog_result == DialogMessageButtonRight) {
// app->extra_options |= LfRfidUsePassword;
// app->setting_hex = LfRfidSettingCurrentPassword;
// scene_manager_next_scene(scene_manager, LfRfidSceneEnterHex);
// } else {
// scene_manager_next_scene(app->scene_manager, LfRfidSceneReadBlockT5577Confirm);
// }
// consumed = true;
} else if(event.event == SubmenuIndexWipeT5577) {
app->extra_options = 0;
//app->extra_options |= LfRfidWipeMode;
DialogMessage* message = dialog_message_alloc();
dialog_message_set_header(message, "T5577 reset", 0, 0, AlignLeft, AlignTop);
dialog_message_set_buttons(message, "No", NULL, "Yes");
dialog_message_set_text(message, " This overwrites T5577 user data blocks. Password must be cleared before",
SCREEN_WIDTH_CENTER, SCREEN_HEIGHT_CENTER, AlignCenter, AlignCenter);
DialogMessageButton dialog_result = dialog_message_show(app->dialogs, message);
dialog_message_free(message);
if (dialog_result == DialogMessageButtonRight) {
scene_manager_next_scene(scene_manager, LfRfidSceneWipeT5577Confirm);
}
consumed = true;
// } else if(event.event == SubmenuIndexHitag) {
// app->read_type = LFRFIDWorkerReadTypeRTFOnly;
// scene_manager_next_scene(app->scene_manager, LfRfidSceneRead);
// dolphin_deed(DolphinDeedRfidRead);
Expand Down
122 changes: 122 additions & 0 deletions applications/main/lfrfid/scenes/lfrfid_scene_setpw_t5577.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
#include "../lfrfid_i.h"
#include "../helpers/lfrfid_dialog.h"

#define LFRFID_T5577_BITRATE_RF_64 0x00140000
#define LFRFID_T5577_MODULATION_MANCHESTER 0x00008000
#define LFRFID_T5577_PWD 0x00000010
#define LFRFID_T5577_MAXBLOCK_SHIFT 5
#define LFRFID_T5577_TESTMODE_DISABLED 0x60000000
#define LFRFID_T5577_PASSWORD_BLOCK_NO 7

static void lfrfid_setpw_t5577_password_and_config_to_EM(LfRfid* app) {
Popup* popup = app->popup;
//char curr_buf[32] = {};
char curr_buf[40] = {};
//TODO: use .txt file in resources for passwords.

//0b00000000000101001000000001000000; //no pwd&aor config block 12,14,17,26 // 0x148040
// 0b00000000000101001000000001010000; //pwd& noAOR config block 12,14BITRATE,17MODUL,26MAXBLoCK,28PWD // 0x148050
//0b00000000000101001000000000000000; //no pwd& noAOR maxblock 0 config block 12,14BITRATE,17MODUL,26MAXBLoCK,28PWD // 0x148000

uint32_t em_config_block_data = (LFRFID_T5577_BITRATE_RF_64 |
LFRFID_T5577_MODULATION_MANCHESTER | (2 << LFRFID_T5577_MAXBLOCK_SHIFT) | LFRFID_T5577_PWD);

if (app->extra_options & LfRfidSetMasterKeyDisableTestMode)
em_config_block_data |= LFRFID_T5577_TESTMODE_DISABLED;

uint8_t* pass_p = app->password;
uint32_t current_password = pass_p[0]<<24 | pass_p[1]<<16 | pass_p[2]<<8 | pass_p[3];
//uint32_t current_password = app->password;
//const uint32_t em_pw_block_data = 1976;
pass_p = app->new_password;
uint32_t new_password = pass_p[0]<<24 | pass_p[1]<<16 | pass_p[2]<<8 | pass_p[3];
//uint32_t new_password = app->new_password;

popup_set_header(popup, "Setting\npassword", 102, 10, AlignCenter, AlignCenter);
//popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61);
popup_set_text(popup, curr_buf, /*92*/66, 33, AlignCenter, AlignCenter);
snprintf(curr_buf, sizeof(curr_buf), "hex: %02X %02X %02X %02X\ndec: %lu", pass_p[0], pass_p[1], pass_p[2], pass_p[3], new_password);
view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);
// DEBUG delay
furi_delay_ms(3000);
notification_message(app->notifications, &sequence_blink_start_magenta);
furi_delay_ms(500);
bool lock_bit = app->extra_options & LfRfidSetPasswordLockBit;
bool use_password = app->extra_options & LfRfidUsePassword;

view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);
{
if (use_password)
t5577_write_page_block_pass_with_start_and_stop(0, LFRFID_T5577_PASSWORD_BLOCK_NO, lock_bit, new_password, true, current_password/*, false*/); // Page 0, block 7
else
t5577_write_page_block_simple_with_start_and_stop(0, LFRFID_T5577_PASSWORD_BLOCK_NO, lock_bit, new_password/*, false*/); // Page 0, block 7
// ^ provare questo soltanto per impostare pw
}
furi_delay_ms(8);

if (app->extra_options & LfRfidDisablePasswordMode)
em_config_block_data &= ~(LFRFID_T5577_PWD);

snprintf(curr_buf, sizeof(curr_buf), "Setting configuration block:\n%08lX", em_config_block_data);
view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup); //needed?
// DEBUG delay
furi_delay_ms(3000);
furi_delay_ms(500);
lock_bit = app->extra_options & LfRfidSetConfigurationLockBit;
{
if (use_password)
t5577_write_page_block_pass_with_start_and_stop(0, 0, lock_bit, em_config_block_data, true, new_password/*, false*/);
else
t5577_write_page_block_simple_with_start_and_stop(0, 0, lock_bit, em_config_block_data/*, false*/);
}
furi_delay_ms(8);

// In case password isn't updated use old one, code up there alone doesn't work in removing password, only in setting password
// Verify if it's needed!
if (use_password)
{
t5577_write_page_block_pass_with_start_and_stop(0, 0, lock_bit, em_config_block_data, true, current_password/*, false*/);
}
furi_delay_ms(8);

notification_message(app->notifications, &sequence_blink_stop);
popup_reset(app->popup);
}

void lfrfid_scene_setpw_t5577_on_enter(void* context) {
LfRfid* app = context;
Popup* popup = app->popup;

lfrfid_setpw_t5577_password_and_config_to_EM(app);

notification_message(app->notifications, &sequence_success);
popup_set_header(popup, "Done!", 102, 10, AlignCenter, AlignTop);
popup_set_icon(popup, 0, 7, &I_RFIDDolphinSuccess_108x57);
popup_set_context(popup, app);
popup_set_callback(popup, lfrfid_popup_timeout_callback);
popup_set_timeout(popup, 1500);
popup_enable_timeout(popup);

view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup);
notification_message_block(app->notifications, &sequence_set_green_255);
}

bool lfrfid_scene_setpw_t5577_on_event(void* context, SceneManagerEvent event) {
LfRfid* app = context;
bool consumed = false;

if(event.type == SceneManagerEventTypeBack) {
consumed = true; // Ignore Back button presses
} else if(event.type == SceneManagerEventTypeCustom && event.event == LfRfidEventPopupClosed) {
scene_manager_search_and_switch_to_previous_scene(
app->scene_manager, LfRfidSceneExtraActions);
consumed = true;
}
return consumed;
}

void lfrfid_scene_setpw_t5577_on_exit(void* context) {
LfRfid* app = context;
popup_reset(app->popup);
notification_message_block(app->notifications, &sequence_reset_green);
}