Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-02-24 15:44:47 +08:00
Code Issues Projects Releases Packages Wiki Activity

1. update SAK

Browse source 
2. ratte's fix. http://www.proxmark.org/forum/viewtopic.php?id=979
This commit is contained in:
Merlokbr@gmail.com 2011-11-04 12:35:00 +00:00
parent ec09b62d88
commit 23487cd23c
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
armsrc/mifarecmd.c
View file

@ -298,7 +298,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
uint8_t uid[8];
uint32_t cuid, nt1, nt2, nttmp, nttest, par, ks1;
uint8_t par_array[4];
nestedVector nvector[NES_MAX_INFO + 1][10];
nestedVector nvector[NES_MAX_INFO + 1][11];
int nvectorcount[NES_MAX_INFO + 1];
int ncount = 0;
UsbCommand ack = {CMD_ACK, {0, 0, 0}};

20
client/cmdhf14a.c
View file

@ -174,15 +174,17 @@ int CmdHF14AReader(const char *Cmd)
PrintAndLog(" UID : %s", sprint_hex(uid, 12));
PrintAndLog(" SAK : %02x [%d]", card->sak, resp->arg[0]);
switch (card->sak) {
case 0: PrintAndLog(" SAK : MIFARE ultralight?"); break;
case 8: PrintAndLog(" SAK : MIFARE CLASSIC 1K"); break;
case 9: PrintAndLog(" SAK : MIFARE MINI"); break;
case 18: PrintAndLog(" SAK : MIFARE CLASSIC 4K"); break;
case 20: PrintAndLog(" SAK : MIFARE DESFIRE or JCOP 31/41"); break;
case 28: PrintAndLog(" SAK : JCOP31 or JCOP41 v2.3.1"); break;
case 38: PrintAndLog(" SAK : Nokia 6212 or 6131 MIFARE CLASSIC 4K"); break;
case 88: PrintAndLog(" SAK : Infineon MIFARE CLASSIC 1K"); break;
case 98: PrintAndLog(" SAK : Gemplus MPCOS"); break;
case 0x00: PrintAndLog(" SAK : MIFARE ultralight?"); break;
case 0x08: PrintAndLog(" SAK : MIFARE CLASSIC 1K"); break;
case 0x09: PrintAndLog(" SAK : MIFARE MINI"); break;
case 0x10: PrintAndLog(" SAK : MIFARE PLUS 1k"); break;
case 0x11: PrintAndLog(" SAK : MIFARE PLUS 4k"); break;
case 0x18: PrintAndLog(" SAK : MIFARE CLASSIC 4K"); break;
case 0x20: PrintAndLog(" SAK : MIFARE DESFIRE | PLUS | JCOP 31/41"); break;
case 0x28: PrintAndLog(" SAK : JCOP31 or JCOP41 v2.3.1"); break;
case 0x38: PrintAndLog(" SAK : Nokia 6212 or 6131 MIFARE CLASSIC 4K"); break;
case 0x88: PrintAndLog(" SAK : Infineon MIFARE CLASSIC 1K"); break;
case 0x98: PrintAndLog(" SAK : Gemplus MPCOS"); break;
default: ;
}
if(resp->arg[0] == 1)