FIX: Coverity , Argument can't be negative, CID #121323, ftell(f) can be negative...

[proxmark3-svn] / client / mifarehost.c

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 830b61cdff97fdf15a03923e877656b12dcfcc00..1cb228bb68881c9be22c9ae7478b317cff6b0455 100644 (file)
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -79,7 +79,8 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
        struct Crypto1State *p1, *p2, *p3, *p4;\r
        \r
        // flush queue\r
-       WaitForResponseTimeout(CMD_ACK,NULL,100);\r
+       clearCommandBuffer();\r
+       //WaitForResponseTimeout(CMD_ACK,NULL,100);\r
        \r
        UsbCommand c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}};\r
        memcpy(c.d.asBytes, key, 6);\r
@@ -237,14 +238,16 @@ int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidt
 \r
 // "MAGIC" CARD\r
 \r
-int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool wantWipe) {\r
-       uint8_t oldblock0[16] = {0x00};\r
-       uint8_t block0[16] = {0x00};\r
+int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard) {\r
+\r
+       uint8_t params = MAGIC_SINGLE;\r
+       uint8_t block0[16];\r
+       memset(block0, 0x00, sizeof(block0));\r
+       \r
 \r
-       int old = mfCGetBlock(0, oldblock0, CSETBLOCK_SINGLE_OPER);\r
+       int old = mfCGetBlock(0, block0, params);\r
        if (old == 0) {\r
-               memcpy(block0, oldblock0, 16);\r
-               PrintAndLog("old block 0:  %s", sprint_hex(block0,16));\r
+               PrintAndLog("old block 0:  %s", sprint_hex(block0, sizeof(block0)));\r
        } else {\r
                PrintAndLog("Couldn't get old data. Will write over the last bytes of Block 0.");\r
        }\r
@@ -255,26 +258,30 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool w
        // Mifare UID BCC\r
        block0[4] = block0[0]^block0[1]^block0[2]^block0[3];\r
        // mifare classic SAK(byte 5) and ATQA(byte 6 and 7, reversed)\r
-       if (sak!=NULL)\r
+       if ( sak != NULL )\r
                block0[5]=sak[0];\r
-       if (atqa!=NULL) {\r
+       \r
+       if ( atqa != NULL ) {\r
                block0[6]=atqa[1];\r
                block0[7]=atqa[0];\r
        }\r
        PrintAndLog("new block 0:  %s", sprint_hex(block0,16));\r
-       return mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER);\r
+       \r
+       if ( wipecard )          params |= MAGIC_WIPE;  \r
+       if ( oldUID == NULL) params |= MAGIC_UID;\r
+       \r
+       return mfCSetBlock(0, block0, oldUID, params);\r
 }\r
 \r
-int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uint8_t params) {\r
+int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {\r
 \r
        uint8_t isOK = 0;\r
-       UsbCommand c = {CMD_MIFARE_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};\r
+       UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params, blockNo, 0}};\r
        memcpy(c.d.asBytes, data, 16); \r
-\r
        clearCommandBuffer();\r
        SendCommand(&c);\r
        UsbCommand resp;\r
-       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {\r
                isOK  = resp.arg[0] & 0xff;\r
                if (uid != NULL) \r
                        memcpy(uid, resp.d.asBytes, 4);\r
@@ -289,9 +296,7 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uin
 \r
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {\r
        uint8_t isOK = 0;\r
-\r
-       UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, 0, blockNo}};\r
-       \r
+       UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};    \r
        clearCommandBuffer();\r
        SendCommand(&c);\r
        UsbCommand resp;\r
@@ -634,19 +639,25 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len){\r
        /*\r
        uint32_t nt;      // tag challenge\r
+       uint32_t nr_enc;  // encrypted reader challenge\r
        uint32_t ar_enc;  // encrypted reader response\r
        uint32_t at_enc;  // encrypted tag response\r
        */\r
-       if (traceCrypto1) {\r
-               crypto1_destroy(traceCrypto1);\r
-       }\r
+\r
+       struct Crypto1State *pcs = NULL;\r
+       \r
        ks2 = ar_enc ^ prng_successor(nt, 64);\r
        ks3 = at_enc ^ prng_successor(nt, 96);\r
-       traceCrypto1 = lfsr_recovery64(ks2, ks3);\r
-\r
-       mf_crypto1_decrypt(traceCrypto1, data, len, 0);\r
-\r
+       \r
+       PrintAndLog("Decrypting data with:");\r
+       PrintAndLog("      nt: %08x",nt);\r
+       PrintAndLog("  ar_enc: %08x",ar_enc);\r
+       PrintAndLog("  at_enc: %08x",at_enc);\r
+       PrintAndLog("\nEncrypted data: [%s]", sprint_hex(data,len) );\r
+\r
+       pcs = lfsr_recovery64(ks2, ks3);\r
+       mf_crypto1_decrypt(pcs, data, len, FALSE);\r
        PrintAndLog("Decrypted data: [%s]", sprint_hex(data,len) );\r
-       crypto1_destroy(traceCrypto1);\r
+       crypto1_destroy(pcs);\r
        return 0;\r
 }\r