dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ADD: 'hf standalone 14a mode", added "mifare 4k" detection.

Browse Source 
ADD: 'hf 14a sim' - added mifare 4k simulation.
This commit is contained in:
iceman1001
2017-02-01 14:41:06 +01:00
parent 507afbf3e6
commit 4401050bcc
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
armsrc/appmain.c
View File

@@ -596,21 +596,25 @@ void StandAloneMode14a()
Dbprintf("Simulating ISO14443a tag with uid: %08x [Bank: %u]", tmpuid & 0xFFFFFFFF , selected);
}
if (uids[selected].sak == 8 && uids[selected].atqa[0] == 4 && uids[selected].atqa[1] == 0) {
DbpString("Mifare Classic");
SimulateIso14443aTag(1, flags, data); // Mifare Classic
}
else if (uids[selected].sak == 0 && uids[selected].atqa[0] == 0x44 && uids[selected].atqa[1] == 0) {
if (uids[selected].sak == 0x08 && uids[selected].atqa[0] == 0x04 && uids[selected].atqa[1] == 0) {
DbpString("Mifare Classic 1k");
SimulateIso14443aTag(1, flags, data);
} else if (uids[selected].sak == 0x18 && uids[selected].atqa[0] == 0x02 && uids[selected].atqa[1] == 0) {
DbpString("Mifare Classic 4k (4b uid)");
SimulateIso14443aTag(8, flags, data);
} else if (uids[selected].sak == 0x08 && uids[selected].atqa[0] == 0x44 && uids[selected].atqa[1] == 0) {
DbpString("Mifare Classic 4k (7b uid)");
SimulateIso14443aTag(8, flags, data);
} else if (uids[selected].sak == 0x00 && uids[selected].atqa[0] == 0x44 && uids[selected].atqa[1] == 0) {
DbpString("Mifare Ultralight");
SimulateIso14443aTag(2, flags, data); // Mifare Ultralight
}
else if (uids[selected].sak == 20 && uids[selected].atqa[0] == 0x44 && uids[selected].atqa[1] == 3) {
SimulateIso14443aTag(2, flags, data);
} else if (uids[selected].sak == 0x20 && uids[selected].atqa[0] == 0x04 && uids[selected].atqa[1] == 0x03) {
DbpString("Mifare DESFire");
SimulateIso14443aTag(3, flags, data); // Mifare DESFire
SimulateIso14443aTag(3, flags, data);
}
else {
Dbprintf("Unrecognized tag type -- defaulting to Mifare Classic emulation");
SimulateIso14443aTag(1, flags, data); // Mifare Classic
SimulateIso14443aTag(1, flags, data);
}
}
else if (button_action == BUTTON_SINGLE_CLICK) {

6
armsrc/iso14443a.c
View File

@@ -918,7 +918,11 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) {
memcpy(data+3, emdata+4, 4); // uid bytes 3-7
flags |= FLAG_7B_UID_IN_DATA;
}
} break;
} break;
case 8: { // MIFARE Classic 4k
response1[0] = 0x02;
sak = 0x18;
} break;
default: {
Dbprintf("Error: unkown tagtype (%d)",tagType);
return;