Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -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

2
applications/main/nfc/helpers/mf_classic_key_cache.c
View File

@@ -63,7 +63,7 @@ bool mf_classic_key_cache_save(MfClassicKeyCache* instance, const MfClassicData*
if(!flipper_format_write_hex_uint64(ff, "Key A map", &data->key_a_mask, 1)) break;
if(!flipper_format_write_hex_uint64(ff, "Key B map", &data->key_b_mask, 1)) break;
uint8_t sector_num = mf_classic_get_total_sectors_num(data->type);
uint8_t sector_num = mf_classic_get_scannable_sectors_num(data->type);
bool key_save_success = true;
for(size_t i = 0; (i < sector_num) && (key_save_success); i++) {
MfClassicSectorTrailer* sec_tr = mf_classic_get_sector_trailer_by_sector(data, i);

2
applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic_render.c
View File

@@ -8,7 +8,7 @@ void nfc_render_mf_classic_info(
FuriString* str) {
nfc_render_iso14443_3a_info(data->iso14443_3a_data, format_type, str);
uint8_t sectors_total = mf_classic_get_total_sectors_num(data->type);
uint8_t sectors_total = mf_classic_get_scannable_sectors_num(data->type);
uint8_t keys_total = sectors_total * 2;
uint8_t keys_found = 0;
uint8_t sectors_read = 0;

2
applications/main/nfc/plugins/supported_cards/aime.c
View File

@@ -51,7 +51,7 @@ static bool aime_read(Nfc* nfc, NfcDevice* device) {
data->type = type;
MfClassicDeviceKeys keys = {};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(aime_key, sizeof(MfClassicKey), keys.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);
bit_lib_num_to_bytes_be(aime_key, sizeof(MfClassicKey), keys.key_b[i].data);

4
applications/main/nfc/plugins/supported_cards/banapass.c
View File

@@ -98,7 +98,7 @@ static bool banapass_read(Nfc* nfc, NfcDevice* device) {
MfClassicDeviceKeys keys = {};
// Access Code Read Attempt
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(
banapass_keys_if_access_code[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);
@@ -116,7 +116,7 @@ static bool banapass_read(Nfc* nfc, NfcDevice* device) {
}
// Value Block Read Attempt
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(
banapass_keys_if_value_block[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);

2
applications/main/nfc/plugins/supported_cards/bip.c
View File

@@ -159,7 +159,7 @@ static bool bip_read(Nfc* nfc, NfcDevice* device) {
.key_a_mask = 0,
.key_b_mask = 0,
};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(bip_1k_keys[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);
bit_lib_num_to_bytes_be(bip_1k_keys[i].b, sizeof(MfClassicKey), keys.key_b[i].data);

2
applications/main/nfc/plugins/supported_cards/charliecard.c
View File

@@ -1230,7 +1230,7 @@ static bool charliecard_read(Nfc* nfc, NfcDevice* device) {
.key_a_mask = 0,
.key_b_mask = 0,
};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(
charliecard_1k_keys[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);

2
applications/main/nfc/plugins/supported_cards/disney_infinity.c
View File

@@ -46,7 +46,7 @@ static bool disney_infinity_read(Nfc* nfc, NfcDevice* device) {
if(error != MfClassicErrorNone) break;
data->type = type;
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
di_key(uid_bytes, &keys.key_a[i]);
di_key(uid_bytes, &keys.key_b[i]);
FURI_BIT_SET(keys.key_a_mask, i);

4
applications/main/nfc/plugins/supported_cards/hi.c
View File

@@ -138,7 +138,7 @@ static bool hi_read(Nfc* nfc, NfcDevice* device) {
uint8_t keyB[HI_KEY_TO_GEN][KEY_LENGTH];
hi_generate_key(uid, keyA, keyB);
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
if(cfg.keys[i].a == 0x000000000000 && cfg.keys[i].b == 0x000000000000) {
cfg.keys[i].a = bit_lib_bytes_to_num_be(keyA[i], KEY_LENGTH);
cfg.keys[i].b = bit_lib_bytes_to_num_be(keyB[i], KEY_LENGTH);
@@ -146,7 +146,7 @@ static bool hi_read(Nfc* nfc, NfcDevice* device) {
}
MfClassicDeviceKeys keys = {};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(cfg.keys[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);
bit_lib_num_to_bytes_be(cfg.keys[i].b, sizeof(MfClassicKey), keys.key_b[i].data);

2
applications/main/nfc/plugins/supported_cards/hid.c
View File

@@ -51,7 +51,7 @@ static bool hid_read(Nfc* nfc, NfcDevice* device) {
data->type = type;
MfClassicDeviceKeys keys = {};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(hid_key, sizeof(MfClassicKey), keys.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);
bit_lib_num_to_bytes_be(hid_key, sizeof(MfClassicKey), keys.key_b[i].data);

4
applications/main/nfc/plugins/supported_cards/hworld.c
View File

@@ -116,7 +116,7 @@ static bool hworld_read(Nfc* nfc, NfcDevice* device) {
data->type = type;
MfClassicDeviceKeys standard_keys = {};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(
hworld_standard_keys[i].a, sizeof(MfClassicKey), standard_keys.key_a[i].data);
FURI_BIT_SET(standard_keys.key_a_mask, i);
@@ -130,7 +130,7 @@ static bool hworld_read(Nfc* nfc, NfcDevice* device) {
FURI_LOG_I(TAG, "Standard card successfully read");
} else {
MfClassicDeviceKeys vip_keys = {};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(
hworld_vip_keys[i].a, sizeof(MfClassicKey), vip_keys.key_a[i].data);
FURI_BIT_SET(vip_keys.key_a_mask, i);

2
applications/main/nfc/plugins/supported_cards/kazan.c
View File

@@ -193,7 +193,7 @@ static bool kazan_read(Nfc* nfc, NfcDevice* device) {
.key_b_mask = 0,
};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(
kazan_1k_keys_v1[i].a, sizeof(MfClassicKey), keys_v1.key_a[i].data);
bit_lib_num_to_bytes_be(

2
applications/main/nfc/plugins/supported_cards/metromoney.c
View File

@@ -97,7 +97,7 @@ static bool metromoney_read(Nfc* nfc, NfcDevice* device) {
.key_a_mask = 0,
.key_b_mask = 0,
};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(
metromoney_1k_keys[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);

4
applications/main/nfc/plugins/supported_cards/microel.c
View File

@@ -128,7 +128,7 @@ static bool microel_read(Nfc* nfc, NfcDevice* device) {
}
// Save keys generated to stucture
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
if(microel_1k_keys[i].a == 0x000000000000) {
microel_1k_keys[i].a = bit_lib_bytes_to_num_be(keyA, KEY_LENGTH);
}
@@ -137,7 +137,7 @@ static bool microel_read(Nfc* nfc, NfcDevice* device) {
}
}
MfClassicDeviceKeys keys = {};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(
microel_1k_keys[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);

4
applications/main/nfc/plugins/supported_cards/mizip.c
View File

@@ -151,7 +151,7 @@ static bool mizip_read(Nfc* nfc, NfcDevice* device) {
uint8_t keyB[MIZIP_KEY_TO_GEN][KEY_LENGTH];
mizip_generate_key(uid, keyA, keyB);
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
if(cfg.keys[i].a == 0x000000000000 && cfg.keys[i].b == 0x000000000000) {
cfg.keys[i].a = bit_lib_bytes_to_num_be(keyA[i], KEY_LENGTH);
cfg.keys[i].b = bit_lib_bytes_to_num_be(keyB[i], KEY_LENGTH);
@@ -159,7 +159,7 @@ static bool mizip_read(Nfc* nfc, NfcDevice* device) {
}
MfClassicDeviceKeys keys = {};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(cfg.keys[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);
bit_lib_num_to_bytes_be(cfg.keys[i].b, sizeof(MfClassicKey), keys.key_b[i].data);

2
applications/main/nfc/plugins/supported_cards/ndef.c
View File

@@ -899,7 +899,7 @@ static bool ndef_mfc_parse(const NfcDevice* device, FuriString* parsed_data) {
// Check MADs for what sectors contain NDEF data AIDs
bool sectors_with_ndef[MF_CLASSIC_TOTAL_SECTORS_MAX] = {0};
const size_t sector_count = mf_classic_get_total_sectors_num(data->type);
const size_t sector_count = mf_classic_get_scannable_sectors_num(data->type);
const struct {
size_t block;
uint8_t aid_count;

2
applications/main/nfc/plugins/supported_cards/plantain.c
View File

@@ -176,7 +176,7 @@ static bool plantain_read(Nfc* nfc, NfcDevice* device) {
}
MfClassicDeviceKeys keys = {};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(cfg.keys[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);
bit_lib_num_to_bytes_be(cfg.keys[i].b, sizeof(MfClassicKey), keys.key_b[i].data);

4
applications/main/nfc/plugins/supported_cards/saflok.c
View File

@@ -240,14 +240,14 @@ static bool saflok_read(Nfc* nfc, NfcDevice* device) {
uint64_t num_key = bit_lib_bytes_to_num_be(key, KEY_LENGTH);
FURI_LOG_D(TAG, "Saflok: Key generated for UID: %012llX", num_key);
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
if(saflok_1k_keys[i].a == 0x000000000000) {
saflok_1k_keys[i].a = num_key;
}
}
MfClassicDeviceKeys keys = {};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(saflok_1k_keys[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);
bit_lib_num_to_bytes_be(saflok_1k_keys[i].b, sizeof(MfClassicKey), keys.key_b[i].data);

2
applications/main/nfc/plugins/supported_cards/skylanders.c
View File

@@ -124,7 +124,7 @@ static bool skylanders_read(Nfc* nfc, NfcDevice* device) {
data->type = type;
MfClassicDeviceKeys keys = {};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
if(i == 0) {
bit_lib_num_to_bytes_be(skylanders_key, sizeof(MfClassicKey), keys.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);

2
applications/main/nfc/plugins/supported_cards/smartrider.c
View File

@@ -134,7 +134,7 @@ static bool smartrider_read(Nfc* nfc, NfcDevice* device) {
data->type = type;
MfClassicDeviceKeys keys = {.key_a_mask = 0, .key_b_mask = 0};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
memcpy(keys.key_a[i].data, STANDARD_KEYS[i == 0 ? 0 : 1], sizeof(STANDARD_KEYS[0]));
if(i > 0) {
memcpy(keys.key_b[i].data, STANDARD_KEYS[2], sizeof(STANDARD_KEYS[0]));

2
applications/main/nfc/plugins/supported_cards/social_moscow.c
View File

@@ -148,7 +148,7 @@ static bool social_moscow_read(Nfc* nfc, NfcDevice* device) {
if(!social_moscow_get_card_config(&cfg, data->type)) break;
MfClassicDeviceKeys keys = {};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(cfg.keys[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);
bit_lib_num_to_bytes_be(cfg.keys[i].b, sizeof(MfClassicKey), keys.key_b[i].data);

2
applications/main/nfc/plugins/supported_cards/troika.c
View File

@@ -151,7 +151,7 @@ static bool troika_read(Nfc* nfc, NfcDevice* device) {
.key_a_mask = 0,
.key_b_mask = 0,
};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(cfg.keys[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);
bit_lib_num_to_bytes_be(cfg.keys[i].b, sizeof(MfClassicKey), keys.key_b[i].data);

2
applications/main/nfc/plugins/supported_cards/two_cities.c
View File

@@ -76,7 +76,7 @@ static bool two_cities_read(Nfc* nfc, NfcDevice* device) {
data->type = type;
MfClassicDeviceKeys keys = {};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(
two_cities_4k_keys[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);

2
applications/main/nfc/plugins/supported_cards/washcity.c
View File

@@ -99,7 +99,7 @@ static bool washcity_read(Nfc* nfc, NfcDevice* device) {
.key_a_mask = 0,
.key_b_mask = 0,
};
for(size_t i = 0; i < mf_classic_get_total_sectors_num(data->type); i++) {
for(size_t i = 0; i < mf_classic_get_scannable_sectors_num(data->type); i++) {
bit_lib_num_to_bytes_be(
washcity_1k_keys[i].a, sizeof(MfClassicKey), keys.key_a[i].data);
FURI_BIT_SET(keys.key_a_mask, i);

2
applications/main/nfc/scenes/nfc_scene_mf_classic_dict_attack.c
View File

@@ -59,7 +59,7 @@ NfcCommand nfc_dict_attack_worker_callback(NfcGenericEvent event, void* context)
mfc_event->data->poller_mode.data = mfc_data;
instance->nfc_dict_context.sectors_total =
mf_classic_get_total_sectors_num(mfc_data->type);
mf_classic_get_scannable_sectors_num(mfc_data->type);
mf_classic_get_read_sectors_and_keys(
mfc_data,
&instance->nfc_dict_context.sectors_read,

2
applications/main/nfc/scenes/nfc_scene_mf_classic_show_keys.c
View File

@@ -23,7 +23,7 @@ void nfc_scene_mf_classic_show_keys_on_enter(void* context) {
furi_string_cat_printf(instance->text_box_store, "\e#Found MFC Keys:");
uint8_t num_sectors = mf_classic_get_total_sectors_num(mfc_data->type);
uint8_t num_sectors = mf_classic_get_scannable_sectors_num(mfc_data->type);
uint8_t found_keys_a = 0, found_keys_b = 0;
for(uint8_t i = 0; i < num_sectors; i++) {
MfClassicSectorTrailer* sec_tr = mf_classic_get_sector_trailer_by_sector(mfc_data, i);