From a3d5d47cfefeca9ff8b40b4ab83f79ec70c56277 Mon Sep 17 00:00:00 2001 From: r3df0xx Date: Wed, 20 Apr 2022 22:23:45 +0300 Subject: [PATCH] ref --- .../subghz/scenes/subghz_scene_set_cnt.c | 2 +- .../subghz/scenes/subghz_scene_set_fix.c | 2 +- .../subghz/scenes/subghz_scene_set_seed.c | 2 +- .../subghz/scenes/subghz_scene_set_type.c | 13 +++++-------- applications/subghz/subghz.c | 8 ++------ applications/subghz/subghz_i.h | 17 +++-------------- 6 files changed, 13 insertions(+), 31 deletions(-) diff --git a/applications/subghz/scenes/subghz_scene_set_cnt.c b/applications/subghz/scenes/subghz_scene_set_cnt.c index e124d7e6a..a58ddb475 100644 --- a/applications/subghz/scenes/subghz_scene_set_cnt.c +++ b/applications/subghz/scenes/subghz_scene_set_cnt.c @@ -17,7 +17,7 @@ void subghz_scene_set_cnt_on_enter(void* context) { subghz_scene_set_cnt_byte_input_callback, NULL, subghz, - subghz->txrx->cnt_data->cnt, + subghz->txrx->secure_data->cnt, 2); view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdByteInput); } diff --git a/applications/subghz/scenes/subghz_scene_set_fix.c b/applications/subghz/scenes/subghz_scene_set_fix.c index f3ab46385..bafa2686c 100644 --- a/applications/subghz/scenes/subghz_scene_set_fix.c +++ b/applications/subghz/scenes/subghz_scene_set_fix.c @@ -17,7 +17,7 @@ void subghz_scene_set_fix_on_enter(void* context) { subghz_scene_set_fix_byte_input_callback, NULL, subghz, - subghz->txrx->fix_data->fix, + subghz->txrx->secure_data->fix, 4); view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdByteInput); } diff --git a/applications/subghz/scenes/subghz_scene_set_seed.c b/applications/subghz/scenes/subghz_scene_set_seed.c index d91cdb5b1..bc5c94750 100644 --- a/applications/subghz/scenes/subghz_scene_set_seed.c +++ b/applications/subghz/scenes/subghz_scene_set_seed.c @@ -17,7 +17,7 @@ void subghz_scene_set_seed_on_enter(void* context) { subghz_scene_set_seed_byte_input_callback, NULL, subghz, - subghz->txrx->seed_data->seed, + subghz->txrx->secure_data->seed, 4); view_dispatcher_switch_to_view(subghz->view_dispatcher, SubGhzViewIdByteInput); } diff --git a/applications/subghz/scenes/subghz_scene_set_type.c b/applications/subghz/scenes/subghz_scene_set_type.c index 90530ec37..678d9adde 100644 --- a/applications/subghz/scenes/subghz_scene_set_type.c +++ b/applications/subghz/scenes/subghz_scene_set_type.c @@ -159,17 +159,14 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) { uint32_t key = subghz_random_serial(); switch(event.event) { case SubmenuIndexFaacSLH: - subghz->txrx->fix_data->fix_len = 4; - subghz->txrx->cnt_data->cnt_len = 2; - subghz->txrx->seed_data->seed_len = 4; scene_manager_next_scene(subghz->scene_manager, SubGhzSceneSetFix); - uint32_t fix_part = subghz->txrx->fix_data->fix[0] << 24 | subghz->txrx->fix_data->fix[1] << 16 | - subghz->txrx->fix_data->fix[2] << 8 | subghz->txrx->fix_data->fix[3]; + uint32_t fix_part = subghz->txrx->secure_data->fix[0] << 24 | subghz->txrx->secure_data->fix[1] << 16 | + subghz->txrx->secure_data->fix[2] << 8 | subghz->txrx->secure_data->fix[3]; FURI_LOG_I(TAG, "fix: %8X", fix_part); - uint16_t cnt = subghz->txrx->cnt_data->cnt[0] << 8 | subghz->txrx->cnt_data->cnt[1]; + uint16_t cnt = subghz->txrx->secure_data->cnt[0] << 8 | subghz->txrx->secure_data->cnt[1]; FURI_LOG_I(TAG, "cnt: %8X", cnt); - uint32_t seed = subghz->txrx->seed_data->seed[0] << 24 | subghz->txrx->seed_data->seed[1] << 16 | - subghz->txrx->seed_data->seed[2] << 8 | subghz->txrx->seed_data->seed[3]; + uint32_t seed = subghz->txrx->secure_data->seed[0] << 24 | subghz->txrx->secure_data->seed[1] << 16 | + subghz->txrx->secure_data->seed[2] << 8 | subghz->txrx->secure_data->seed[3]; FURI_LOG_I(TAG, "seed: %8X", seed); subghz->txrx->transmitter = subghz_transmitter_alloc_init(subghz->txrx->environment, "Faac SLH"); diff --git a/applications/subghz/subghz.c b/applications/subghz/subghz.c index 4c3ba27d3..ce962d431 100644 --- a/applications/subghz/subghz.c +++ b/applications/subghz/subghz.c @@ -143,9 +143,7 @@ SubGhz* subghz_alloc() { subghz->txrx->history = subghz_history_alloc(); subghz->txrx->worker = subghz_worker_alloc(); subghz->txrx->fff_data = flipper_format_string_alloc(); - subghz->txrx->seed_data = malloc(sizeof(SeedData)); - subghz->txrx->fix_data = malloc(sizeof(FixData)); - subghz->txrx->cnt_data = malloc(sizeof(CntData)); + subghz->txrx->secure_data = malloc(sizeof(SecureData)); subghz->txrx->environment = subghz_environment_alloc(); subghz_environment_set_came_atomo_rainbow_table_file_name( subghz->txrx->environment, "/ext/subghz/assets/came_atomo"); @@ -243,9 +241,7 @@ void subghz_free(SubGhz* subghz) { subghz_worker_free(subghz->txrx->worker); flipper_format_free(subghz->txrx->fff_data); subghz_history_free(subghz->txrx->history); - free(subghz->txrx->seed_data); - free(subghz->txrx->fix_data); - free(subghz->txrx->cnt_data); + free(subghz->txrx->secure_data); free(subghz->txrx); //Error string diff --git a/applications/subghz/subghz_i.h b/applications/subghz/subghz_i.h index 71ff5e884..d090954ec 100644 --- a/applications/subghz/subghz_i.h +++ b/applications/subghz/subghz_i.h @@ -83,19 +83,10 @@ typedef enum { } SubGhzLoadKeyState; typedef struct { - uint8_t seed_len; - uint8_t seed[4]; -} SeedData; - -typedef struct { - uint8_t fix_len; uint8_t fix[4]; -} FixData; - -typedef struct { - uint8_t cnt_len; uint8_t cnt[2]; -} CntData; + uint8_t seed[4]; +} SecureData; struct SubGhzTxRx { SubGhzWorker* worker; @@ -105,9 +96,7 @@ struct SubGhzTxRx { SubGhzTransmitter* transmitter; SubGhzProtocolDecoderBase* decoder_result; FlipperFormat* fff_data; - SeedData* seed_data; - FixData* fix_data; - CntData* cnt_data; + SecureData* secure_data; uint32_t frequency; FuriHalSubGhzPreset preset;