github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 13:53:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

move detection outside SAK 02 check

Browse source
This commit is contained in:
iceman1001 2022-04-30 21:05:20 +02:00
commit c78459a572
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
client/src/cmdhf14a.c
View file

@ -1597,20 +1597,6 @@ static int detect_nxp_card(uint8_t sak, uint16_t atqa, uint64_t select_status) {
} else if ((sak & 0x04) == 0x04) { } else if ((sak & 0x04) == 0x04) {
printTag("Any MIFARE CL1"); printTag("Any MIFARE CL1");
type |= MTDESFIRE; type |= MTDESFIRE;
} else if ((sak & 0x0A) == 0x0A) {
if ((atqa & 0x0003) == 0x0003) {
// Uses Shanghai algo
printTag("FM11RF005SH (FUDAN Shanghai Metro)");
type |= MTFUDAN;
} else if ((atqa & 0x0005) == 0x0005) {
printTag("FM11RF005M (FUDAN MIFARE Classic clone)");
type |= MTFUDAN;
}
}
else if ((sak & 0x53) == 0x53) {
printTag("FM11RF08SH (FUDAN)");
type |= MTFUDAN;
} else { } else {
printTag("MIFARE Ultralight"); printTag("MIFARE Ultralight");
printTag("MIFARE Ultralight C"); printTag("MIFARE Ultralight C");
@ -1620,6 +1606,19 @@ static int detect_nxp_card(uint8_t sak, uint16_t atqa, uint64_t select_status) {
printTag("NTAG 2xx"); printTag("NTAG 2xx");
type |= MTULTRALIGHT; type |= MTULTRALIGHT;
} }
} else if ((sak & 0x0A) == 0x0A) {
if ((atqa & 0x0003) == 0x0003) {
// Uses Shanghai algo
printTag("FM11RF005SH (FUDAN Shanghai Metro)");
type |= MTFUDAN;
} else if ((atqa & 0x0005) == 0x0005) {
printTag("FM11RF005M (FUDAN MIFARE Classic clone)");
type |= MTFUDAN;
}
} else if ((sak & 0x53) == 0x53) {
printTag("FM11RF08SH (FUDAN)");
type |= MTFUDAN;
} }
if (type == MTNONE) { if (type == MTNONE) {