Mirrors/unleashed-firmware
2
0
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware synced 2024-12-04 02:09:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update ndef parser, apply mf classic dict changes

Browse source 
by @Willy-JL

https://github.com/Flipper-XFW/Xtreme-Firmware/blob/dev/applications/main/nfc/plugins/supported_cards/ndef.c
https://github.com/Flipper-XFW/Xtreme-Firmware/blob/dev/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
This commit is contained in:
MX 2024-02-10 14:46:46 +03:00
parent 5b97ddc842
commit 1a02152d03
No known key found for this signature in database
GPG key ID: 7CCC66B7DBDD1C83
2 changed files with 1066 additions and 581 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
applications/main/nfc/plugins/supported_cards/ndef.c
View file

@ -362,20 +362,26 @@ static bool ndef_parse(const NfcDevice* device, FuriString* parsed_data) {
// Memory layout documentation: // Memory layout documentation:
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrfxlib/nfc/doc/type_2_tag.html#id2 // https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrfxlib/nfc/doc/type_2_tag.html#id2
// Double check static values layout // Check card type can contain NDEF
// First 4 static reserved pages for UID, internal and lock bytes if(data->type != MfUltralightTypeNTAG203 && data->type != MfUltralightTypeNTAG213 &&
// (Not sure if NDEF cata can be found in cards with different layout) data->type != MfUltralightTypeNTAG215 && data->type != MfUltralightTypeNTAG216 &&
if(data->page[0].data[0] != 0x04) break; data->type != MfUltralightTypeNTAGI2C1K && data->type != MfUltralightTypeNTAGI2C2K) {
if(data->page[2].data[1] != 0x48) break; // Internal break;
if(data->page[2].data[2] != 0x00) break; // Lock bytes }
if(data->page[2].data[3] != 0x00) break; // ...
if(data->page[3].data[0] != 0xE1) break; // Capability container
if(data->page[3].data[1] != 0x10) break; // ...
// Data content starts here at 5th page // Double check Capability Container (CC) and find data area bounds
struct {
uint8_t nfc_magic_number;
uint8_t document_version_number;
uint8_t data_area_size;
uint8_t read_write_access;
}* cc = (void*)&data->page[3].data[0];
if(cc->nfc_magic_number != 0xE1) break;
if(cc->document_version_number != 0x10) break;
const uint8_t* cur = &data->page[4].data[0]; const uint8_t* cur = &data->page[4].data[0];
const uint8_t* end = &data->page[0].data[0] + const uint8_t* end = cur + (cc->data_area_size * 2 * MF_ULTRALIGHT_PAGE_SIZE);
(mf_ultralight_get_pages_total(data->type) * MF_ULTRALIGHT_PAGE_SIZE); size_t max_size = mf_ultralight_get_pages_total(data->type) * MF_ULTRALIGHT_PAGE_SIZE;
end = MIN(end, &data->page[0].data[0] + max_size);
size_t message_num = 0; size_t message_num = 0;
// Parse as TLV (see docs above) // Parse as TLV (see docs above)

1617
applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
View file

File diff suppressed because it is too large Load diff