From 23487cd23c564c2fdc020746e757a8e1fa48aaf0 Mon Sep 17 00:00:00 2001 From: "Merlokbr@gmail.com" Date: Fri, 4 Nov 2011 12:35:00 +0000 Subject: [PATCH] 1. update SAK 2. ratte's fix. http://www.proxmark.org/forum/viewtopic.php?id=979 --- armsrc/mifarecmd.c | 2 +- client/cmdhf14a.c | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c index d2795b1a..4148a3c2 100644 --- a/armsrc/mifarecmd.c +++ b/armsrc/mifarecmd.c @@ -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}}; diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index 2a8c1f87..4fe7d346 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -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) -- 2.39.5