Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-23 05:24:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

ofw pr 4316 MIFARE Plus 2K Cards in SL1 Mode

Browse Source 
testing only, for dev branch
PR by LuemmelSec

https://github.com/flipperdevices/flipperzero-firmware/pull/4316/files

TODO: mf_classic_get_total_sectors_num
This commit is contained in:
MX
2025-12-13 19:21:15 +03:00
parent 969770919a
commit 647e65cfae
29 changed files with 74 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/nfc/protocols/mf_classic/mf_classic_poller.c
View File

@@ -134,6 +134,22 @@ NfcCommand mf_classic_poller_handler_detect_type(MfClassicPoller* instance) {
instance->state = MfClassicPollerStateStart;
instance->current_type_check = MfClassicType4k;
FURI_LOG_D(TAG, "4K detected");
} else {
instance->current_type_check = MfClassicTypePlus2k;
}
} else if(instance->current_type_check == MfClassicTypePlus2k) {
// Second-last block in sector 16, which may exist if said sector is not in SL3 mode
MfClassicError error =
mf_classic_poller_get_nt(instance, 66, MfClassicKeyTypeA, NULL, false);
if(error != MfClassicErrorNone) {
// If sector 16 is locked/SL3, try sector 17 as well before falling back
error = mf_classic_poller_get_nt(instance, 70, MfClassicKeyTypeA, NULL, false);
}
if(error == MfClassicErrorNone) {
instance->data->type = MfClassicTypePlus2k;
instance->state = MfClassicPollerStateStart;
instance->current_type_check = MfClassicType4k;
FURI_LOG_D(TAG, "Plus 2K detected");
} else {
instance->current_type_check = MfClassicType1k;
}
@@ -157,7 +173,7 @@ NfcCommand mf_classic_poller_handler_detect_type(MfClassicPoller* instance) {
NfcCommand mf_classic_poller_handler_start(MfClassicPoller* instance) {
NfcCommand command = NfcCommandContinue;
instance->sectors_total = mf_classic_get_total_sectors_num(instance->data->type);
instance->sectors_total = mf_classic_get_scannable_sectors_num(instance->data->type);
memset(&instance->mode_ctx, 0, sizeof(MfClassicPollerModeContext));
instance->mfc_event.type = MfClassicPollerEventTypeRequestMode;