liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFC: Support reading Mifare Classic key B from sector trailer, reading sector with B key where A key can't read block, Nfc Magic app not using NFC folder by default (in file select) (#2437)

Browse Source 
* NFC: Support reading Mifare Classic key B from sector trailer and reusing it for other sectors
* NFC: Fix my pointer typo
* NFC: Fix reading sector with B key where A key can't read block (fixes #2413) and fix Nfc Magic app not using NFC folder by default (in file select)
* NFC: Fix strange bug

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
AloneLiberty
2023-03-07 21:33:59 +03:00
committed by GitHub
parent 9819306731
commit eb5dae1cda
5 changed files with 63 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/nfc/protocols/mifare_classic.c
View File

@@ -541,6 +541,7 @@ bool mf_classic_authenticate_skip_activate(
bool mf_classic_auth_attempt(
FuriHalNfcTxRxContext* tx_rx,
Crypto1* crypto,
MfClassicAuthContext* auth_ctx,
uint64_t key) {
furi_assert(tx_rx);
@@ -549,15 +550,14 @@ bool mf_classic_auth_attempt(
bool need_halt = (auth_ctx->key_a == MF_CLASSIC_NO_KEY) &&
(auth_ctx->key_b == MF_CLASSIC_NO_KEY);
Crypto1 crypto;
if(auth_ctx->key_a == MF_CLASSIC_NO_KEY) {
// Try AUTH with key A
if(mf_classic_auth(
tx_rx,
mf_classic_get_first_block_num_of_sector(auth_ctx->sector),
mf_classic_get_sector_trailer_block_num_by_sector(auth_ctx->sector),
key,
MfClassicKeyA,
&crypto,
crypto,
false,
0)) {
auth_ctx->key_a = key;
@@ -573,10 +573,10 @@ bool mf_classic_auth_attempt(
// Try AUTH with key B
if(mf_classic_auth(
tx_rx,
mf_classic_get_first_block_num_of_sector(auth_ctx->sector),
mf_classic_get_sector_trailer_block_num_by_sector(auth_ctx->sector),
key,
MfClassicKeyB,
&crypto,
crypto,
false,
0)) {
auth_ctx->key_b = key;
@@ -671,6 +671,9 @@ void mf_classic_read_sector(FuriHalNfcTxRxContext* tx_rx, MfClassicData* data, u
do {
if(blocks_read == total_blocks) break;
if(!key_b_found) break;
if(key_a_found) {
furi_hal_nfc_sleep();
}
FURI_LOG_D(TAG, "Try to read blocks with key B");
key = nfc_util_bytes2num(sec_tr->key_b, sizeof(sec_tr->key_b));
if(!mf_classic_auth(tx_rx, start_block, key, MfClassicKeyB, &crypto, false, 0)) break;

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

@@ -174,6 +174,7 @@ bool mf_classic_authenticate_skip_activate(
bool mf_classic_auth_attempt(
FuriHalNfcTxRxContext* tx_rx,
Crypto1* crypto,
MfClassicAuthContext* auth_ctx,
uint64_t key);