Merge pull request #98 from marshmellow42/master

Iceman's fixes for #93, #96, #97

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index ac839cfdc081049ac8ceccaa784c41306158c04e..64bbcbf50eaaa456123163bc16bd115a13e77ef2 100644 (file)
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2270,6 +2270,7 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
        if (_7BUID) {
                rATQA[0] = 0x44;
                rUIDBCC1[0] = 0x88;
+               rUIDBCC1[4] = rUIDBCC1[0] ^ rUIDBCC1[1] ^ rUIDBCC1[2] ^ rUIDBCC1[3];
                rUIDBCC2[4] = rUIDBCC2[0] ^ rUIDBCC2[1] ^ rUIDBCC2[2] ^ rUIDBCC2[3];
        }
 

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index d36ebb8bee959220547577c0d31495b764630e3b..200c9dcd6d9dd84431fb71ea79f9096f0d32b24b 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -152,18 +152,43 @@ int CmdHF14AReader(const char *Cmd)
                return 0;
        }
 
-       PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
+       if(select_status == 3) {
+               PrintAndLog("Card doesn't support standard iso14443-3 anticollision");
+               PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
+               // disconnect
+               c.arg[0] = 0;
+               c.arg[1] = 0;
+               c.arg[2] = 0;
+               SendCommand(&c);
+               return 0;
+       }
+
        PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));
+       PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
        PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
 
-       // Double & triple sized UID, can be mapped to a manufacturer.
-       // HACK: does this apply for Ultralight cards?
-       if ( card.uidlen > 4 ) {
-               PrintAndLog("MANUFACTURER : %s", getTagInfo(card.uid[0]));
-       }
-
        switch (card.sak) {
-               case 0x00: PrintAndLog("TYPE : NXP MIFARE Ultralight | Ultralight C"); break;
+               case 0x00: 
+                       // check if the tag answers to GETVERSION (0x60)
+                       c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
+                       c.arg[1] = 1;
+                       c.arg[2] = 0;
+                       c.d.asBytes[0] = 0x60;
+                       SendCommand(&c);
+                       WaitForResponse(CMD_ACK,&resp);
+
+                       uint8_t version[8] = {0,0,0,0,0,0,0,0};
+                       memcpy(&version, resp.d.asBytes, resp.arg[0]);
+                       uint8_t len = resp.arg[0] & 0xff;
+                       switch ( len ){
+                               // todo, identify "Magic UL-C tags". // they usually have a static nonce response to 0x1A command.
+                               // UL-EV1, size, check version[6] == 0x0b (smaller)  0x0b * 4 == 48
+                               case 0x0A:PrintAndLog("TYPE : NXP MIFARE Ultralight EV1 %d bytes", (version[6] == 0xB) ? 48 : 128);break;
+                               case 0x01:PrintAndLog("TYPE : NXP MIFARE Ultralight C");break;
+                               case 0x00:PrintAndLog("TYPE : NXP MIFARE Ultralight");break;    
+                       }
+
+                       break;
                case 0x01: PrintAndLog("TYPE : NXP TNP3xxx Activision Game Appliance"); break;
                case 0x04: PrintAndLog("TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); break;
                case 0x08: PrintAndLog("TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1"); break;
@@ -180,6 +205,12 @@ int CmdHF14AReader(const char *Cmd)
                default: ;
        }
 
+       // Double & triple sized UID, can be mapped to a manufacturer.
+       // HACK: does this apply for Ultralight cards?
+       if ( card.uidlen > 4 ) {
+               PrintAndLog("MANUFACTURER : %s", getTagInfo(card.uid[0]));
+       }
+
        // try to request ATS even if tag claims not to support it
        if (select_status == 2) {
                uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0

diff --git a/client/scripting.c b/client/scripting.c
index 0ccdeeec7a8d497d5a288fef2fcc0e8998a0e865..d7f51c234ea0b5751ca2e82f28fe8e77ec771246 100644 (file)
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -261,7 +261,7 @@ static int l_aes(lua_State *L)
 
     aes_context ctx;
     aes_init(&ctx);
-    aes_setkey_enc(&ctx,(const unsigned char *)p_key,128);
+    aes_setkey_dec(&ctx, aes_key, 128);
        aes_crypt_cbc(&ctx,AES_DECRYPT,sizeof(indata), iv, indata,outdata );
     //Push decrypted array as a string
        lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));