Mirrors/unleashed-firmware
2
0
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware synced 2024-11-27 15:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix

Browse source
This commit is contained in:
r3df0xx 2022-04-01 23:20:31 +03:00
parent 0e2542e1c4
commit c6d6c89a86
2 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/subghz/protocols/keeloq.c
View file

@ -494,7 +494,6 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector(
// https://phreakerclub.com/forum/showpost.php?p=43557&postcount=37
man = subghz_protocol_keeloq_common_normal_learning(fix, manufacture_code->key);
FURI_LOG_I(TAG, "mfkey: %llX", manufacture_code->key);
FURI_LOG_I(TAG, "man_learning: %llX", man);
decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) {
*manufacture_name = string_get_cstr(manufacture_code->name);
@ -505,7 +504,6 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector(
man = subghz_protocol_keeloq_common_secure_learning(
fix, seed, manufacture_code->key);
FURI_LOG_I(TAG, "mfkey: %llX", manufacture_code->key);
FURI_LOG_I(TAG, "man_learning: %llX", man);
decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) {
*manufacture_name = string_get_cstr(manufacture_code->name);
@ -516,7 +514,6 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector(
man = subghz_protocol_keeloq_common_magic_xor_type1_learning(
fix, manufacture_code->key);
FURI_LOG_I(TAG, "mfkey: %llX", manufacture_code->key);
FURI_LOG_I(TAG, "man_learning: %llX", man);
decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) {
*manufacture_name = string_get_cstr(manufacture_code->name);
@ -538,8 +535,6 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector(
man_rev_byte = (uint8_t)(manufacture_code->key >> i);
man_rev = man_rev | man_rev_byte << (56 - i);
}
FURI_LOG_I(TAG, "man_learning_rev: %llX", man_rev);
FURI_LOG_I(TAG, "man_learning: %llX", man);
decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_rev);
if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) {
*manufacture_name = string_get_cstr(manufacture_code->name);
@ -550,7 +545,6 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector(
// https://phreakerclub.com/forum/showpost.php?p=43557&postcount=37
man = subghz_protocol_keeloq_common_normal_learning(fix, manufacture_code->key);
FURI_LOG_I(TAG, "mfkey: %llX", manufacture_code->key);
FURI_LOG_I(TAG, "man_learning: %llX", man);
decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) {
*manufacture_name = string_get_cstr(manufacture_code->name);
@ -559,8 +553,6 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector(
// Check for mirrored man
man = subghz_protocol_keeloq_common_normal_learning(fix, man_rev);
FURI_LOG_I(TAG, "man_learning_rev: %llX", man_rev);
FURI_LOG_I(TAG, "man_learning: %llX", man);
decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) {
*manufacture_name = string_get_cstr(manufacture_code->name);
@ -571,7 +563,6 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector(
man = subghz_protocol_keeloq_common_secure_learning(
fix, seed, manufacture_code->key);
FURI_LOG_I(TAG, "mfkey: %llX", manufacture_code->key);
FURI_LOG_I(TAG, "man_learning: %llX", man);
decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) {
*manufacture_name = string_get_cstr(manufacture_code->name);
@ -580,8 +571,6 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector(
// Check for mirrored man
man = subghz_protocol_keeloq_common_secure_learning(fix, seed, man_rev);
FURI_LOG_I(TAG, "man_learning_rev: %llX", man_rev);
FURI_LOG_I(TAG, "man_learning: %llX", man);
decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) {
*manufacture_name = string_get_cstr(manufacture_code->name);
@ -592,7 +581,6 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector(
man = subghz_protocol_keeloq_common_magic_xor_type1_learning(
fix, manufacture_code->key);
FURI_LOG_I(TAG, "mfkey: %llX", manufacture_code->key);
FURI_LOG_I(TAG, "man_learning: %llX", man);
decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) {
*manufacture_name = string_get_cstr(manufacture_code->name);
@ -601,8 +589,6 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector(
// Check for mirrored man
man = subghz_protocol_keeloq_common_magic_xor_type1_learning(fix, man_rev);
FURI_LOG_I(TAG, "man_learning_rev: %llX", man_rev);
FURI_LOG_I(TAG, "man_learning: %llX", man);
decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) {
*manufacture_name = string_get_cstr(manufacture_code->name);

6
lib/subghz/protocols/star_line.c
View file

@ -126,6 +126,7 @@ static bool subghz_protocol_star_line_gen_data(SubGhzProtocolEncoderStarLine* in
instance->generic.cnt;
uint32_t hop = 0;
uint64_t man = 0;
uint64_t code_found_reverse;
int res = 0;
for
@ -472,7 +473,6 @@ static uint8_t subghz_protocol_star_line_check_remote_controller_selector(
man_normal_learning =
subghz_protocol_keeloq_common_normal_learning(fix, manufacture_code->key);
FURI_LOG_I(TAG, "mfkey: %llX", manufacture_code->key);
FURI_LOG_I(TAG, "man_learning: %llX", man);
decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_normal_learning);
if(subghz_protocol_star_line_check_decrypt(instance, decrypt, btn, end_serial)) {
*manufacture_name = string_get_cstr(manufacture_code->name);
@ -494,7 +494,6 @@ static uint8_t subghz_protocol_star_line_check_remote_controller_selector(
man_rev_byte = (uint8_t)(manufacture_code->key >> i);
man_rev = man_rev | man_rev_byte << (56 - i);
}
FURI_LOG_I(TAG, "man_learning_rev: %llX", man_rev);
decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_rev);
if(subghz_protocol_star_line_check_decrypt(instance, decrypt, btn, end_serial)) {
*manufacture_name = string_get_cstr(manufacture_code->name);
@ -506,15 +505,12 @@ static uint8_t subghz_protocol_star_line_check_remote_controller_selector(
man_normal_learning =
subghz_protocol_keeloq_common_normal_learning(fix, manufacture_code->key);
FURI_LOG_I(TAG, "mfkey: %llX", manufacture_code->key);
FURI_LOG_I(TAG, "man_learning: %llX", man_normal_learning);
decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_normal_learning);
if(subghz_protocol_star_line_check_decrypt(instance, decrypt, btn, end_serial)) {
*manufacture_name = string_get_cstr(manufacture_code->name);
return 1;
}
man_normal_learning = subghz_protocol_keeloq_common_normal_learning(fix, man_rev);
FURI_LOG_I(TAG, "man_learning_rev: %llX", man_rev);
FURI_LOG_I(TAG, "man_learning: %llX", man_normal_learning);
decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_normal_learning);
if(subghz_protocol_star_line_check_decrypt(instance, decrypt, btn, end_serial)) {
*manufacture_name = string_get_cstr(manufacture_code->name);