From 39e9dd0ab0c136281ce9e37c31b9a762fa764d4d Mon Sep 17 00:00:00 2001 From: Methodius Date: Sun, 14 Jan 2024 20:24:45 +0900 Subject: [PATCH] T5577 write/clear with custom password option added --- applications/main/lfrfid/lfrfid.c | 24 ++++++++ applications/main/lfrfid/lfrfid_i.h | 4 ++ .../lfrfid/scenes/lfrfid_scene_clear_t5577.c | 19 ++++++- .../main/lfrfid/scenes/lfrfid_scene_config.h | 3 +- .../scenes/lfrfid_scene_enter_password.c | 55 +++++++++++++++++++ .../scenes/lfrfid_scene_extra_actions.c | 4 +- .../scenes/lfrfid_scene_saved_key_menu.c | 12 ++-- ...ss.c => lfrfid_scene_write_and_set_pass.c} | 26 +++------ lib/lfrfid/lfrfid_worker.c | 11 ++-- lib/lfrfid/lfrfid_worker.h | 4 +- lib/lfrfid/lfrfid_worker_i.h | 2 +- lib/lfrfid/lfrfid_worker_modes.c | 32 ++++++++--- lib/lfrfid/tools/t5577.c | 29 +--------- lib/lfrfid/tools/t5577.h | 4 +- targets/f7/api_symbols.csv | 5 +- 15 files changed, 157 insertions(+), 77 deletions(-) create mode 100644 applications/main/lfrfid/scenes/lfrfid_scene_enter_password.c rename applications/main/lfrfid/scenes/{lfrfid_scene_write_with_pass.c => lfrfid_scene_write_and_set_pass.c} (79%) diff --git a/applications/main/lfrfid/lfrfid.c b/applications/main/lfrfid/lfrfid.c index 8eb78a9c7..bd64c7906 100644 --- a/applications/main/lfrfid/lfrfid.c +++ b/applications/main/lfrfid/lfrfid.c @@ -1,6 +1,30 @@ #include "lfrfid_i.h" #include +//TODO: use .txt file in resources for passwords. +const uint32_t default_passwords[] = { + 0x51243648, 0x000D8787, 0x19920427, 0x50524F58, 0xF9DCEBA0, 0x65857569, 0x05D73B9F, 0x89A69E60, + 0x314159E0, 0xAA55BBBB, 0xA5B4C3D2, 0x1C0B5848, 0x00434343, 0x444E4752, 0x4E457854, 0x44B44CAE, + 0x88661858, 0xE9920427, 0x575F4F4B, 0x50520901, 0x20206666, 0x65857569, 0x5469616E, 0x7686962A, + 0xC0F5009A, 0x07CEE75D, 0xfeedbeef, 0xdeadc0de, 0x00000000, 0x11111111, 0x22222222, 0x33333333, + 0x44444444, 0x55555555, 0x66666666, 0x77777777, 0x88888888, 0x99999999, 0xAAAAAAAA, 0xBBBBBBBB, + 0xCCCCCCCC, 0xDDDDDDDD, 0xEEEEEEEE, 0xFFFFFFFF, 0xa0a1a2a3, 0xb0b1b2b3, 0x50415353, 0x00000001, + 0x00000002, 0x0000000a, 0x0000000b, 0x01020304, 0x02030405, 0x03040506, 0x04050607, 0x05060708, + 0x06070809, 0x0708090A, 0x08090A0B, 0x090A0B0C, 0x0A0B0C0D, 0x0B0C0D0E, 0x0C0D0E0F, 0x01234567, + 0x12345678, 0x10000000, 0x20000000, 0x30000000, 0x40000000, 0x50000000, 0x60000000, 0x70000000, + 0x80000000, 0x90000000, 0xA0000000, 0xB0000000, 0xC0000000, 0xD0000000, 0xE0000000, 0xF0000000, + 0x10101010, 0x01010101, 0x11223344, 0x22334455, 0x33445566, 0x44556677, 0x55667788, 0x66778899, + 0x778899AA, 0x8899AABB, 0x99AABBCC, 0xAABBCCDD, 0xBBCCDDEE, 0xCCDDEEFF, 0x0CB7E7FC, 0xFABADA11, + 0x87654321, 0x12341234, 0x69696969, 0x12121212, 0x12344321, 0x1234ABCD, 0x11112222, 0x13131313, + 0x10041004, 0x31415926, 0xabcd1234, 0x20002000, 0x19721972, 0xaa55aa55, 0x55aa55aa, 0x4f271149, + 0x07d7bb0b, 0x9636ef8f, 0xb5f44686, 0x9E3779B9, 0xC6EF3720, 0x7854794A, 0xF1EA5EED, 0x69314718, + 0x57721566, 0x93C467E3, 0x27182818, 0x50415353}; + +const uint32_t* lfrfid_get_t5577_default_passwords(uint8_t* len) { + *len = sizeof(default_passwords) / sizeof(uint32_t); + return default_passwords; +} + static bool lfrfid_debug_custom_event_callback(void* context, uint32_t event) { furi_assert(context); LfRfid* app = context; diff --git a/applications/main/lfrfid/lfrfid_i.h b/applications/main/lfrfid/lfrfid_i.h index fc9f861a5..cff2c6cc4 100644 --- a/applications/main/lfrfid/lfrfid_i.h +++ b/applications/main/lfrfid/lfrfid_i.h @@ -98,6 +98,8 @@ struct LfRfid { uint8_t* old_key_data; uint8_t* new_key_data; + uint8_t password[4]; + RpcAppSystem* rpc_ctx; LfRfidRpcState rpc_state; @@ -145,3 +147,5 @@ void lfrfid_popup_timeout_callback(void* context); void lfrfid_widget_callback(GuiButtonType result, InputType type, void* context); void lfrfid_text_input_callback(void* context); + +const uint32_t* lfrfid_get_t5577_default_passwords(uint8_t* len); \ No newline at end of file diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c index c42ad6acb..71b6b7aee 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c @@ -1,4 +1,5 @@ #include "../lfrfid_i.h" +#include "tools/t5577.h" #define TAG "Clear T5577" static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) { @@ -6,7 +7,7 @@ static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) { char curr_buf[32] = {}; uint8_t default_passwords_len; - const uint32_t* default_passwords = t5577_get_default_passwords(&default_passwords_len); + const uint32_t* default_passwords = lfrfid_get_t5577_default_passwords(&default_passwords_len); popup_set_header(popup, "Removing\npassword", 90, 36, AlignCenter, AlignCenter); popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61); @@ -15,14 +16,26 @@ static void lfrfid_clear_t5577_password_and_config_to_EM(LfRfid* app) { LFRFIDT5577 data = { .block[0] = 0b00000000000101001000000001000000, - .blocks_to_write = 1, + .block[7] = 0, + .mask = 0b10000001, }; + // Clear custom password + uint32_t custom_pass = (app->password[0] << 24) | (app->password[1] << 16) | + (app->password[2] << 8) | (app->password[3]); + snprintf(curr_buf, sizeof(curr_buf), "Custom password"); + view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup); + + t5577_write_with_mask(&data, 0, true, custom_pass); + + furi_delay_ms(8); + + // Clear default passwords for(uint8_t i = 0; i < default_passwords_len; i++) { snprintf(curr_buf, sizeof(curr_buf), "Pass %d of %d", i, default_passwords_len); view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup); - t5577_write_with_pass(&data, default_passwords[i]); + t5577_write_with_mask(&data, 0, true, default_passwords[i]); furi_delay_ms(8); } diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_config.h b/applications/main/lfrfid/scenes/lfrfid_scene_config.h index 0d7dfe46d..47844a8b3 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_config.h +++ b/applications/main/lfrfid/scenes/lfrfid_scene_config.h @@ -6,7 +6,7 @@ ADD_SCENE(lfrfid, exit_confirm, ExitConfirm) ADD_SCENE(lfrfid, delete_confirm, DeleteConfirm) ADD_SCENE(lfrfid, read_key_menu, ReadKeyMenu) ADD_SCENE(lfrfid, write, Write) -ADD_SCENE(lfrfid, write_with_pass, WriteWithPass) +ADD_SCENE(lfrfid, write_and_set_pass, WriteAndSetPass) ADD_SCENE(lfrfid, write_success, WriteSuccess) ADD_SCENE(lfrfid, emulate, Emulate) ADD_SCENE(lfrfid, save_name, SaveName) @@ -18,6 +18,7 @@ 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, enter_password, EnterPassword) ADD_SCENE(lfrfid, delete_success, DeleteSuccess) ADD_SCENE(lfrfid, extra_actions, ExtraActions) ADD_SCENE(lfrfid, raw_info, RawInfo) diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_enter_password.c b/applications/main/lfrfid/scenes/lfrfid_scene_enter_password.c new file mode 100644 index 000000000..486be136c --- /dev/null +++ b/applications/main/lfrfid/scenes/lfrfid_scene_enter_password.c @@ -0,0 +1,55 @@ +#include "../lfrfid_i.h" +#include "gui/scene_manager.h" + +int next_scene; + +void lfrfid_scene_enter_password_on_enter(void* context) { + LfRfid* app = context; + ByteInput* byte_input = app->byte_input; + + // true - use password for write, false - use password for clear pass + next_scene = scene_manager_get_scene_state(app->scene_manager, LfRfidSceneEnterPassword); + + bool password_set = app->password[0] | app->password[1] | app->password[2] | app->password[3]; + + if(next_scene == LfRfidSceneWriteAndSetPass && !password_set) { + uint8_t password_list_size; + const uint32_t* password_list = lfrfid_get_t5577_default_passwords(&password_list_size); + uint32_t pass = password_list[furi_get_tick() % password_list_size]; + + for(uint8_t i = 0; i < 4; i++) app->password[i] = (pass >> (8 * i)) & 0xFF; + } + + byte_input_set_header_text(byte_input, "Enter the password in hex"); + + byte_input_set_result_callback( + byte_input, lfrfid_text_input_callback, NULL, app, app->password, 4); + + view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewByteInput); +} + +bool lfrfid_scene_enter_password_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; + + scene_manager_next_scene(scene_manager, next_scene); + scene_manager_set_scene_state(scene_manager, LfRfidSceneEnterPassword, 1); + } + } else if(event.type == SceneManagerEventTypeBack) { + uint32_t prev_scenes[] = {LfRfidSceneExtraActions, LfRfidSceneSavedKeyMenu}; + scene_manager_set_scene_state(scene_manager, LfRfidSceneEnterPassword, 0); + scene_manager_search_and_switch_to_previous_scene_one_of( + scene_manager, prev_scenes, sizeof(prev_scenes[0])); + } + + return consumed; +} + +void lfrfid_scene_enter_password_on_exit(void* context) { + UNUSED(context); +} diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c b/applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c index 3eb34fde9..db4458236 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_extra_actions.c @@ -80,7 +80,9 @@ bool lfrfid_scene_extra_actions_on_event(void* context, SceneManagerEvent event) dolphin_deed(DolphinDeedRfidRead); consumed = true; } else if(event.event == SubmenuIndexClearT5577) { - scene_manager_next_scene(app->scene_manager, LfRfidSceneClearT5577Confirm); + scene_manager_set_scene_state( + app->scene_manager, LfRfidSceneEnterPassword, LfRfidSceneClearT5577Confirm); + scene_manager_next_scene(app->scene_manager, LfRfidSceneEnterPassword); consumed = true; } else if(event.event == SubmenuIndexRAW) { scene_manager_next_scene(app->scene_manager, LfRfidSceneRawName); diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_saved_key_menu.c b/applications/main/lfrfid/scenes/lfrfid_scene_saved_key_menu.c index f01688a66..b4d6a6f43 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_saved_key_menu.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_saved_key_menu.c @@ -4,7 +4,7 @@ typedef enum { SubmenuIndexEmulate, SubmenuIndexWrite, - SubmenuIndexWriteWithPass, + SubmenuIndexWriteAndSetPass, SubmenuIndexEdit, SubmenuIndexDelete, SubmenuIndexInfo, @@ -26,8 +26,8 @@ void lfrfid_scene_saved_key_menu_on_enter(void* context) { submenu, "Write", SubmenuIndexWrite, lfrfid_scene_saved_key_menu_submenu_callback, app); submenu_add_item( submenu, - "Write with pass", - SubmenuIndexWriteWithPass, + "Write and set pass", + SubmenuIndexWriteAndSetPass, lfrfid_scene_saved_key_menu_submenu_callback, app); submenu_add_item( @@ -55,8 +55,10 @@ bool lfrfid_scene_saved_key_menu_on_event(void* context, SceneManagerEvent event } else if(event.event == SubmenuIndexWrite) { scene_manager_next_scene(app->scene_manager, LfRfidSceneWrite); consumed = true; - } else if(event.event == SubmenuIndexWriteWithPass) { - scene_manager_next_scene(app->scene_manager, LfRfidSceneWriteWithPass); + } else if(event.event == SubmenuIndexWriteAndSetPass) { + scene_manager_set_scene_state( + app->scene_manager, LfRfidSceneEnterPassword, LfRfidSceneWriteAndSetPass); + scene_manager_next_scene(app->scene_manager, LfRfidSceneEnterPassword); consumed = true; } else if(event.event == SubmenuIndexEdit) { scene_manager_next_scene(app->scene_manager, LfRfidSceneSaveData); diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_write_with_pass.c b/applications/main/lfrfid/scenes/lfrfid_scene_write_and_set_pass.c similarity index 79% rename from applications/main/lfrfid/scenes/lfrfid_scene_write_with_pass.c rename to applications/main/lfrfid/scenes/lfrfid_scene_write_and_set_pass.c index 263db5cde..275a3e889 100644 --- a/applications/main/lfrfid/scenes/lfrfid_scene_write_with_pass.c +++ b/applications/main/lfrfid/scenes/lfrfid_scene_write_and_set_pass.c @@ -1,6 +1,7 @@ #include "../lfrfid_i.h" +#include "gui/scene_manager.h" -static void lfrfid_write_with_pass_callback(LFRFIDWorkerWriteResult result, void* context) { +static void lfrfid_write_and_set_pass_callback(LFRFIDWorkerWriteResult result, void* context) { LfRfid* app = context; uint32_t event = 0; @@ -17,22 +18,11 @@ static void lfrfid_write_with_pass_callback(LFRFIDWorkerWriteResult result, void view_dispatcher_send_custom_event(app->view_dispatcher, event); } -void lfrfid_scene_write_with_pass_on_enter(void* context) { +void lfrfid_scene_write_and_set_pass_on_enter(void* context) { LfRfid* app = context; Popup* popup = app->popup; - popup_set_header(popup, "Writing", 89, 30, AlignCenter, AlignTop); - if(!furi_string_empty(app->file_name)) { - popup_set_text(popup, furi_string_get_cstr(app->file_name), 89, 43, AlignCenter, AlignTop); - } else { - popup_set_text( - popup, - protocol_dict_get_name(app->dict, app->protocol_id), - 89, - 43, - AlignCenter, - AlignTop); - } + popup_set_header(popup, "Writing\nwith password", 89, 30, AlignCenter, AlignTop); popup_set_icon(popup, 0, 3, &I_RFIDDolphinSend_97x61); view_dispatcher_switch_to_view(app->view_dispatcher, LfRfidViewPopup); @@ -41,12 +31,12 @@ void lfrfid_scene_write_with_pass_on_enter(void* context) { protocol_dict_get_data(app->dict, app->protocol_id, app->old_key_data, size); lfrfid_worker_start_thread(app->lfworker); - lfrfid_worker_write_with_pass_start( - app->lfworker, (LFRFIDProtocol)app->protocol_id, lfrfid_write_with_pass_callback, app); + lfrfid_worker_write_and_set_pass_start( + app->lfworker, (LFRFIDProtocol)app->protocol_id, lfrfid_write_and_set_pass_callback, app); notification_message(app->notifications, &sequence_blink_start_magenta); } -bool lfrfid_scene_write_with_pass_on_event(void* context, SceneManagerEvent event) { +bool lfrfid_scene_write_and_set_pass_on_event(void* context, SceneManagerEvent event) { LfRfid* app = context; Popup* popup = app->popup; bool consumed = false; @@ -82,7 +72,7 @@ bool lfrfid_scene_write_with_pass_on_event(void* context, SceneManagerEvent even return consumed; } -void lfrfid_scene_write_with_pass_on_exit(void* context) { +void lfrfid_scene_write_and_set_pass_on_exit(void* context) { LfRfid* app = context; notification_message(app->notifications, &sequence_blink_stop); popup_reset(app->popup); diff --git a/lib/lfrfid/lfrfid_worker.c b/lib/lfrfid/lfrfid_worker.c index 6b40924d2..7fda36f0b 100644 --- a/lib/lfrfid/lfrfid_worker.c +++ b/lib/lfrfid/lfrfid_worker.c @@ -8,13 +8,13 @@ typedef enum { LFRFIDEventStopMode = (1 << 1), LFRFIDEventRead = (1 << 2), LFRFIDEventWrite = (1 << 3), - LFRFIDEventWriteWithPass = (1 << 4), + LFRFIDEventWriteAndSetPass = (1 << 4), LFRFIDEventEmulate = (1 << 5), LFRFIDEventReadRaw = (1 << 6), LFRFIDEventEmulateRaw = (1 << 7), LFRFIDEventAll = (LFRFIDEventStopThread | LFRFIDEventStopMode | LFRFIDEventRead | LFRFIDEventWrite | - LFRFIDEventWriteWithPass | LFRFIDEventEmulate | LFRFIDEventReadRaw | + LFRFIDEventWriteAndSetPass | LFRFIDEventEmulate | LFRFIDEventReadRaw | LFRFIDEventEmulateRaw), } LFRFIDEventType; @@ -71,7 +71,7 @@ void lfrfid_worker_write_start( furi_thread_flags_set(furi_thread_get_id(worker->thread), LFRFIDEventWrite); } -void lfrfid_worker_write_with_pass_start( +void lfrfid_worker_write_and_set_pass_start( LFRFIDWorker* worker, LFRFIDProtocol protocol, LFRFIDWorkerWriteCallback callback, @@ -80,7 +80,7 @@ void lfrfid_worker_write_with_pass_start( worker->protocol = protocol; worker->write_cb = callback; worker->cb_ctx = context; - furi_thread_flags_set(furi_thread_get_id(worker->thread), LFRFIDEventWriteWithPass); + furi_thread_flags_set(furi_thread_get_id(worker->thread), LFRFIDEventWriteAndSetPass); } void lfrfid_worker_emulate_start(LFRFIDWorker* worker, LFRFIDProtocol protocol) { @@ -159,7 +159,8 @@ static int32_t lfrfid_worker_thread(void* thread_context) { // switch mode if(flags & LFRFIDEventRead) worker->mode_index = LFRFIDWorkerRead; if(flags & LFRFIDEventWrite) worker->mode_index = LFRFIDWorkerWrite; - if(flags & LFRFIDEventWriteWithPass) worker->mode_index = LFRFIDWorkerWriteWithPass; + if(flags & LFRFIDEventWriteAndSetPass) + worker->mode_index = LFRFIDWorkerWriteAndSetPass; if(flags & LFRFIDEventEmulate) worker->mode_index = LFRFIDWorkerEmulate; if(flags & LFRFIDEventReadRaw) worker->mode_index = LFRFIDWorkerReadRaw; if(flags & LFRFIDEventEmulateRaw) worker->mode_index = LFRFIDWorkerEmulateRaw; diff --git a/lib/lfrfid/lfrfid_worker.h b/lib/lfrfid/lfrfid_worker.h index ed09d6143..7ec6b6008 100644 --- a/lib/lfrfid/lfrfid_worker.h +++ b/lib/lfrfid/lfrfid_worker.h @@ -107,14 +107,14 @@ void lfrfid_worker_write_start( void* context); /** - * @brief Start write with pass mode + * @brief Start write and set pass mode * * @param worker * @param protocol * @param callback * @param context */ -void lfrfid_worker_write_with_pass_start( +void lfrfid_worker_write_and_set_pass_start( LFRFIDWorker* worker, LFRFIDProtocol protocol, LFRFIDWorkerWriteCallback callback, diff --git a/lib/lfrfid/lfrfid_worker_i.h b/lib/lfrfid/lfrfid_worker_i.h index 16d1f9716..7c31151bb 100644 --- a/lib/lfrfid/lfrfid_worker_i.h +++ b/lib/lfrfid/lfrfid_worker_i.h @@ -22,7 +22,7 @@ typedef enum { LFRFIDWorkerIdle, LFRFIDWorkerRead, LFRFIDWorkerWrite, - LFRFIDWorkerWriteWithPass, + LFRFIDWorkerWriteAndSetPass, LFRFIDWorkerEmulate, LFRFIDWorkerReadRaw, LFRFIDWorkerEmulateRaw, diff --git a/lib/lfrfid/lfrfid_worker_modes.c b/lib/lfrfid/lfrfid_worker_modes.c index 3db438eec..17e42ad97 100644 --- a/lib/lfrfid/lfrfid_worker_modes.c +++ b/lib/lfrfid/lfrfid_worker_modes.c @@ -1,3 +1,4 @@ +#include "lfrfid/lfrfid_i.h" #include #include #include "lfrfid_worker_i.h" @@ -48,6 +49,15 @@ void lfrfid_worker_delay(LFRFIDWorker* worker, uint32_t milliseconds) { } } +void t5577_trace(LFRFIDT5577 t5577, const char* message) { + if(furi_log_get_level() == FuriLogLevelTrace) { + FURI_LOG_T(TAG, "%s", message); + for(uint8_t i = 0; i < 8; i++) FURI_LOG_T(TAG, "\nBlock %u %08lX", i, t5577.block[i]); + FURI_LOG_T(TAG, "Mask: %u", t5577.mask); + FURI_LOG_T(TAG, "Blocks to write: %lu", t5577.blocks_to_write); + } +} + /**************************************************************************************************/ /********************************************** READ **********************************************/ /**************************************************************************************************/ @@ -574,7 +584,7 @@ static void lfrfid_worker_mode_write_process(LFRFIDWorker* worker) { free(read_data); } -static void lfrfid_worker_mode_write_with_pass_process(LFRFIDWorker* worker) { +static void lfrfid_worker_mode_write_and_set_pass_process(LFRFIDWorker* worker) { LFRFIDProtocol protocol = worker->protocol; LFRFIDWriteRequest* request = malloc(sizeof(LFRFIDWriteRequest)); request->write_type = LFRFIDWriteTypeT5577; @@ -592,18 +602,22 @@ static void lfrfid_worker_mode_write_with_pass_process(LFRFIDWorker* worker) { if(can_be_written) { while(!lfrfid_worker_check_for_stop(worker)) { - FURI_LOG_D(TAG, "Data write"); + FURI_LOG_D(TAG, "Data write with pass"); - uint8_t size; - const uint32_t* password_list = t5577_get_default_passwords(&size); + LfRfid* app = worker->cb_ctx; + uint32_t pass = (app->password[0] << 24) | (app->password[1] << 16) | + (app->password[2] << 8) | (app->password[3]); - uint32_t pass = password_list[rand() % size]; + request->t5577.mask = 0b10000001; + for(uint8_t i = 0; i < request->t5577.blocks_to_write; i++) + request->t5577.mask |= (1 << i); - request->t5577.mask = 0b1111111; - request->t5577.block[0] |= 0b10000; + request->t5577.block[0] |= (1 << 4); request->t5577.block[7] = pass; - t5577_write_with_mask(&request->t5577, 0, 0); + t5577_trace(request->t5577, "Write with password"); + + t5577_write_with_mask(&request->t5577, 0, true, 0); ProtocolId read_result = PROTOCOL_NO; LFRFIDWorkerReadState state = lfrfid_worker_read_internal( @@ -719,7 +733,7 @@ const LFRFIDWorkerModeType lfrfid_worker_modes[] = { [LFRFIDWorkerIdle] = {.process = NULL}, [LFRFIDWorkerRead] = {.process = lfrfid_worker_mode_read_process}, [LFRFIDWorkerWrite] = {.process = lfrfid_worker_mode_write_process}, - [LFRFIDWorkerWriteWithPass] = {.process = lfrfid_worker_mode_write_with_pass_process}, + [LFRFIDWorkerWriteAndSetPass] = {.process = lfrfid_worker_mode_write_and_set_pass_process}, [LFRFIDWorkerEmulate] = {.process = lfrfid_worker_mode_emulate_process}, [LFRFIDWorkerReadRaw] = {.process = lfrfid_worker_mode_read_raw_process}, [LFRFIDWorkerEmulateRaw] = {.process = lfrfid_worker_mode_emulate_raw_process}, diff --git a/lib/lfrfid/tools/t5577.c b/lib/lfrfid/tools/t5577.c index 83ae99989..7d6d6d298 100644 --- a/lib/lfrfid/tools/t5577.c +++ b/lib/lfrfid/tools/t5577.c @@ -1,6 +1,7 @@ #include "t5577.h" #include #include +#include #define T5577_TIMING_WAIT_TIME 400 #define T5577_TIMING_START_GAP 30 @@ -16,30 +17,6 @@ #define T5577_BLOCKS_IN_PAGE_0 8 #define T5577_BLOCKS_IN_PAGE_1 4 -//TODO: use .txt file in resources for passwords. -const uint32_t default_passwords[] = { - 0x51243648, 0x000D8787, 0x19920427, 0x50524F58, 0xF9DCEBA0, 0x65857569, 0x05D73B9F, 0x89A69E60, - 0x314159E0, 0xAA55BBBB, 0xA5B4C3D2, 0x1C0B5848, 0x00434343, 0x444E4752, 0x4E457854, 0x44B44CAE, - 0x88661858, 0xE9920427, 0x575F4F4B, 0x50520901, 0x20206666, 0x65857569, 0x5469616E, 0x7686962A, - 0xC0F5009A, 0x07CEE75D, 0xfeedbeef, 0xdeadc0de, 0x00000000, 0x11111111, 0x22222222, 0x33333333, - 0x44444444, 0x55555555, 0x66666666, 0x77777777, 0x88888888, 0x99999999, 0xAAAAAAAA, 0xBBBBBBBB, - 0xCCCCCCCC, 0xDDDDDDDD, 0xEEEEEEEE, 0xFFFFFFFF, 0xa0a1a2a3, 0xb0b1b2b3, 0x50415353, 0x00000001, - 0x00000002, 0x0000000a, 0x0000000b, 0x01020304, 0x02030405, 0x03040506, 0x04050607, 0x05060708, - 0x06070809, 0x0708090A, 0x08090A0B, 0x090A0B0C, 0x0A0B0C0D, 0x0B0C0D0E, 0x0C0D0E0F, 0x01234567, - 0x12345678, 0x10000000, 0x20000000, 0x30000000, 0x40000000, 0x50000000, 0x60000000, 0x70000000, - 0x80000000, 0x90000000, 0xA0000000, 0xB0000000, 0xC0000000, 0xD0000000, 0xE0000000, 0xF0000000, - 0x10101010, 0x01010101, 0x11223344, 0x22334455, 0x33445566, 0x44556677, 0x55667788, 0x66778899, - 0x778899AA, 0x8899AABB, 0x99AABBCC, 0xAABBCCDD, 0xBBCCDDEE, 0xCCDDEEFF, 0x0CB7E7FC, 0xFABADA11, - 0x87654321, 0x12341234, 0x69696969, 0x12121212, 0x12344321, 0x1234ABCD, 0x11112222, 0x13131313, - 0x10041004, 0x31415926, 0xabcd1234, 0x20002000, 0x19721972, 0xaa55aa55, 0x55aa55aa, 0x4f271149, - 0x07d7bb0b, 0x9636ef8f, 0xb5f44686, 0x9E3779B9, 0xC6EF3720, 0x7854794A, 0xF1EA5EED, 0x69314718, - 0x57721566, 0x93C467E3, 0x27182818, 0x50415353}; - -const uint32_t* t5577_get_default_passwords(uint8_t* len) { - *len = sizeof(default_passwords) / sizeof(uint32_t); - return default_passwords; -} - static void t5577_start() { furi_hal_rfid_tim_read_start(125000, 0.5); @@ -145,7 +122,7 @@ void t5577_write_with_pass(LFRFIDT5577* data, uint32_t password) { t5577_stop(); } -void t5577_write_with_mask(LFRFIDT5577* data, uint8_t page, uint32_t password) { +void t5577_write_with_mask(LFRFIDT5577* data, uint8_t page, bool with_pass, uint32_t password) { t5577_start(); FURI_CRITICAL_ENTER(); @@ -157,7 +134,7 @@ void t5577_write_with_mask(LFRFIDT5577* data, uint8_t page, uint32_t password) { bool need_to_write = mask & 1; mask >>= 1; if(!need_to_write) continue; - t5577_write_block_pass(page, i, false, data->block[i], true, password); + t5577_write_block_pass(page, i, false, data->block[i], with_pass, password); } t5577_write_reset(); FURI_CRITICAL_EXIT(); diff --git a/lib/lfrfid/tools/t5577.h b/lib/lfrfid/tools/t5577.h index e78581ac0..f7b5cc4f5 100644 --- a/lib/lfrfid/tools/t5577.h +++ b/lib/lfrfid/tools/t5577.h @@ -45,8 +45,6 @@ typedef struct { uint8_t mask; } LFRFIDT5577; -const uint32_t* t5577_get_default_passwords(uint8_t* len); - /** * @brief Write T5577 tag data to tag * @@ -56,7 +54,7 @@ void t5577_write(LFRFIDT5577* data); void t5577_write_with_pass(LFRFIDT5577* data, uint32_t password); -void t5577_write_with_mask(LFRFIDT5577* data, uint8_t page, uint32_t password); +void t5577_write_with_mask(LFRFIDT5577* data, uint8_t page, bool with_pass, uint32_t password); #ifdef __cplusplus } diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv index acd954475..11d4918cc 100644 --- a/targets/f7/api_symbols.csv +++ b/targets/f7/api_symbols.csv @@ -2069,8 +2069,8 @@ Function,+,lfrfid_worker_read_start,void,"LFRFIDWorker*, LFRFIDWorkerReadType, L Function,+,lfrfid_worker_start_thread,void,LFRFIDWorker* Function,+,lfrfid_worker_stop,void,LFRFIDWorker* Function,+,lfrfid_worker_stop_thread,void,LFRFIDWorker* +Function,+,lfrfid_worker_write_and_set_pass_start,void,"LFRFIDWorker*, LFRFIDProtocol, LFRFIDWorkerWriteCallback, void*" Function,+,lfrfid_worker_write_start,void,"LFRFIDWorker*, LFRFIDProtocol, LFRFIDWorkerWriteCallback, void*" -Function,+,lfrfid_worker_write_with_pass_start,void,"LFRFIDWorker*, LFRFIDProtocol, LFRFIDWorkerWriteCallback, void*" Function,-,lgamma,double,double Function,-,lgamma_r,double,"double, int*" Function,-,lgammaf,float,float @@ -3227,9 +3227,8 @@ Function,+,submenu_set_header,void,"Submenu*, const char*" Function,+,submenu_set_orientation,void,"Submenu*, ViewOrientation" Function,+,submenu_set_selected_item,void,"Submenu*, uint32_t" Function,-,system,int,const char* -Function,+,t5577_get_default_passwords,const uint32_t*,uint8_t* Function,+,t5577_write,void,LFRFIDT5577* -Function,+,t5577_write_with_mask,void,"LFRFIDT5577*, uint8_t, uint32_t" +Function,+,t5577_write_with_mask,void,"LFRFIDT5577*, uint8_t, _Bool, uint32_t" Function,+,t5577_write_with_pass,void,"LFRFIDT5577*, uint32_t" Function,-,tan,double,double Function,-,tanf,float,float