1. update SAK

2. ratte's fix. http://www.proxmark.org/forum/viewtopic.php?id=979

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index d2795b1a2c2ca2e5a810c4ea90629a1d51b254a9..4148a3c29cac13707409701e8833589d4f333335 100644 (file)
--- 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];\r
        uint32_t cuid, nt1, nt2, nttmp, nttest, par, ks1;\r
        uint8_t par_array[4];\r
        uint8_t uid[8];\r
        uint32_t cuid, nt1, nt2, nttmp, nttest, par, ks1;\r
        uint8_t par_array[4];\r

-       nestedVector nvector[NES_MAX_INFO + 1][10];\r
+       nestedVector nvector[NES_MAX_INFO + 1][11];\r

        int nvectorcount[NES_MAX_INFO + 1];\r
        int ncount = 0;\r
        UsbCommand ack = {CMD_ACK, {0, 0, 0}};\r
        int nvectorcount[NES_MAX_INFO + 1];\r
        int ncount = 0;\r
        UsbCommand ack = {CMD_ACK, {0, 0, 0}};\r

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 2a8c1f8766294b095a19ff08e1f7eccaabd86201..4fe7d346761ae5a5ec2e1f4921198ae31811eb08 100644 (file)
--- 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) {
        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)
                default: ;
        }
        if(resp->arg[0] == 1)