mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 12:42:30 +04:00
Code Issues Activity

NFC: MF Classic parsers read() fix (dictionary attack skip) (#3355)

Browse Source 
* NFC: MF Classic lib: MfClassicErrorPartialRead added

* unnecessary imports removed

* MfClassicError refactor by @gornekich

Co-authored-by: gornekich <n.gorbadey@gmail.com>

---------

Co-authored-by: gornekich <n.gorbadey@gmail.com>
This commit is contained in:
Leptopt1los
2024-02-07 01:53:42 +09:00
committed by GitHub
parent e6f078eeb7
commit ed34dfa1c6
7 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@ static bool aime_read(Nfc* nfc, NfcDevice* device) {
} }
error = mf_classic_poller_sync_read(nfc, &keys, data); error = mf_classic_poller_sync_read(nfc, &keys, data);
if(error != MfClassicErrorNone) { if(error == MfClassicErrorNotPresent) {
FURI_LOG_W(TAG, "Failed to read data"); FURI_LOG_W(TAG, "Failed to read data");
break; break;
} }

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

@@ -60,7 +60,7 @@ static bool hid_read(Nfc* nfc, NfcDevice* device) {
} }
error = mf_classic_poller_sync_read(nfc, &keys, data); error = mf_classic_poller_sync_read(nfc, &keys, data);
if(error != MfClassicErrorNone) { if(error == MfClassicErrorNotPresent) {
FURI_LOG_W(TAG, "Failed to read data"); FURI_LOG_W(TAG, "Failed to read data");
break; break;
} }

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

@@ -135,14 +135,14 @@ static bool plantain_read(Nfc* nfc, NfcDevice* device) {
} }
error = mf_classic_poller_sync_read(nfc, &keys, data); error = mf_classic_poller_sync_read(nfc, &keys, data);
if(error != MfClassicErrorNone) { if(error != MfClassicErrorNotPresent) {
FURI_LOG_W(TAG, "Failed to read data"); FURI_LOG_W(TAG, "Failed to read data");
break; break;
} }
nfc_device_set_data(device, NfcProtocolMfClassic, data); nfc_device_set_data(device, NfcProtocolMfClassic, data);
is_read = true; is_read = (error == MfClassicErrorNone);
} while(false); } while(false);
mf_classic_free(data); mf_classic_free(data);

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

@@ -137,14 +137,14 @@ static bool troika_read(Nfc* nfc, NfcDevice* device) {
} }
error = mf_classic_poller_sync_read(nfc, &keys, data); error = mf_classic_poller_sync_read(nfc, &keys, data);
if(error != MfClassicErrorNone) { if(error == MfClassicErrorNotPresent) {
FURI_LOG_W(TAG, "Failed to read data"); FURI_LOG_W(TAG, "Failed to read data");
break; break;
} }
nfc_device_set_data(device, NfcProtocolMfClassic, data); nfc_device_set_data(device, NfcProtocolMfClassic, data);
is_read = true; is_read = (error == MfClassicErrorNone);
} while(false); } while(false);
mf_classic_free(data); mf_classic_free(data);

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

@@ -85,14 +85,14 @@ static bool two_cities_read(Nfc* nfc, NfcDevice* device) {
} }
error = mf_classic_poller_sync_read(nfc, &keys, data); error = mf_classic_poller_sync_read(nfc, &keys, data);
if(error != MfClassicErrorNone) { if(error != MfClassicErrorNotPresent) {
FURI_LOG_W(TAG, "Failed to read data"); FURI_LOG_W(TAG, "Failed to read data");
break; break;
} }
nfc_device_set_data(device, NfcProtocolMfClassic, data); nfc_device_set_data(device, NfcProtocolMfClassic, data);
is_read = true; is_read = (error == MfClassicErrorNone);
} while(false); } while(false);
mf_classic_free(data); mf_classic_free(data);

1
lib/nfc/protocols/mf_classic/mf_classic.h
View File

@@ -39,6 +39,7 @@ typedef enum {
MfClassicErrorNotPresent, MfClassicErrorNotPresent,
MfClassicErrorProtocol, MfClassicErrorProtocol,
MfClassicErrorAuth, MfClassicErrorAuth,
MfClassicErrorPartialRead,
MfClassicErrorTimeout, MfClassicErrorTimeout,
} MfClassicError; } MfClassicError;

11
lib/nfc/protocols/mf_classic/mf_classic_poller_sync.c
View File

@@ -475,19 +475,16 @@ MfClassicError
nfc_poller_stop(poller); nfc_poller_stop(poller);
if(poller_context.error != MfClassicErrorNone) {
error = poller_context.error;
} else {
const MfClassicData* mfc_data = nfc_poller_get_data(poller); const MfClassicData* mfc_data = nfc_poller_get_data(poller);
uint8_t sectors_read = 0; uint8_t sectors_read = 0;
uint8_t keys_found = 0; uint8_t keys_found = 0;
mf_classic_get_read_sectors_and_keys(mfc_data, &sectors_read, &keys_found); mf_classic_get_read_sectors_and_keys(mfc_data, &sectors_read, &keys_found);
if((sectors_read > 0) || (keys_found > 0)) { if((sectors_read == 0) && (keys_found == 0)) {
mf_classic_copy(data, mfc_data);
} else {
error = MfClassicErrorNotPresent; error = MfClassicErrorNotPresent;
} } else {
mf_classic_copy(data, mfc_data);
error = mf_classic_is_card_read(mfc_data) ? MfClassicErrorNone : MfClassicErrorPartialRead;
} }
nfc_poller_free(poller); nfc_poller_free(poller);