DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-12-24 13:52:38 +03:00
Code Issues Projects Releases Wiki Activity

Fix crash on Ultralight unlock

Browse Source
This commit is contained in:
Astra 2024-08-26 20:46:49 +09:00
parent 99655c15e4
commit 0e71813749
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/main/nfc/helpers/protocol_support/iso14443_3a/iso14443_3a_render.c
View File

@ -1,6 +1,6 @@
#include "iso14443_3a_render.h" #include "iso14443_3a_render.h"
void nfc_render_iso14443_3a_format_bytes(FuriString* str, const uint8_t* const data, size_t size) { void nfc_render_iso14443_3a_format_bytes(FuriString* str, const uint8_t* data, size_t size) {
for(size_t i = 0; i < size; i++) { for(size_t i = 0; i < size; i++) {
furi_string_cat_printf(str, " %02X", data[i]); furi_string_cat_printf(str, " %02X", data[i]);
} }

2
applications/main/nfc/helpers/protocol_support/iso14443_3a/iso14443_3a_render.h
View File

@ -11,7 +11,7 @@ void nfc_render_iso14443_3a_info(
void nfc_render_iso14443_tech_type(const Iso14443_3aData* data, FuriString* str); void nfc_render_iso14443_tech_type(const Iso14443_3aData* data, FuriString* str);
void nfc_render_iso14443_3a_format_bytes(FuriString* str, const uint8_t* const data, size_t size); void nfc_render_iso14443_3a_format_bytes(FuriString* str, const uint8_t* data, size_t size);
void nfc_render_iso14443_3a_brief(const Iso14443_3aData* data, FuriString* str); void nfc_render_iso14443_3a_brief(const Iso14443_3aData* data, FuriString* str);

25
applications/main/nfc/helpers/protocol_support/mf_ultralight/mf_ultralight_render.c
View File

@ -10,22 +10,29 @@ static void nfc_render_mf_ultralight_pages_count(const MfUltralightData* data, F
} }
void nfc_render_mf_ultralight_pwd_pack(const MfUltralightData* data, FuriString* str) { void nfc_render_mf_ultralight_pwd_pack(const MfUltralightData* data, FuriString* str) {
MfUltralightConfigPages* config;
bool all_pages = mf_ultralight_is_all_data_read(data); bool all_pages = mf_ultralight_is_all_data_read(data);
if(all_pages) { bool has_config = mf_ultralight_get_config_page(data, &config);
if(!has_config) {
furi_string_cat_printf(str, "\e#Already Unlocked!");
} else if(all_pages) {
furi_string_cat_printf(str, "\e#All Pages Are Unlocked!"); furi_string_cat_printf(str, "\e#All Pages Are Unlocked!");
} else { } else {
furi_string_cat_printf(str, "\e#Some Pages Are Locked!"); furi_string_cat_printf(str, "\e#Some Pages Are Locked!");
} }
MfUltralightConfigPages* config; if(has_config) {
mf_ultralight_get_config_page(data, &config); furi_string_cat_printf(str, "\nPassword: ");
nfc_render_iso14443_3a_format_bytes(
str, config->password.data, MF_ULTRALIGHT_AUTH_PASSWORD_SIZE);
furi_string_cat_printf(str, "\nPassword: "); furi_string_cat_printf(str, "\nPACK: ");
nfc_render_iso14443_3a_format_bytes( nfc_render_iso14443_3a_format_bytes(str, config->pack.data, MF_ULTRALIGHT_AUTH_PACK_SIZE);
str, config->password.data, MF_ULTRALIGHT_AUTH_PASSWORD_SIZE); } else {
furi_string_cat_printf(str, "\nThis card does not support\npassword protection!");
furi_string_cat_printf(str, "\nPACK: "); }
nfc_render_iso14443_3a_format_bytes(str, config->pack.data, MF_ULTRALIGHT_AUTH_PACK_SIZE);
nfc_render_mf_ultralight_pages_count(data, str); nfc_render_mf_ultralight_pages_count(data, str);
} }