CHG: print_hex_break now prints rownumber instead of byte position

[proxmark3-svn] / armsrc / mifareutil.c

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index f155a92d7fc0575237af8f722f2befca97010396..20d4b68b7e99a9029ca31165797c77e9cca2be7a 100644 (file)
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -32,10 +32,10 @@ void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len){
                for (i = 0; i < len; i++)\r
                        data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];\r
        } else {\r
-               bt = 0;\r
-               for (i = 0; i < 4; i++)\r
-                       bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data[0], i)) << i;\r
-                               \r
+               bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data[0], 0)) << 0;\r
+               bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data[0], 1)) << 1;\r
+               bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data[0], 2)) << 2;\r
+               bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data[0], 3)) << 3;\r
                data[0] = bt;\r
        }\r
        return;\r
@@ -49,20 +49,18 @@ void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, u
        for (i = 0; i < len; i++) {\r
                bt = data[i];\r
                data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];\r
-               if((i&0x0007) == 0) \r
+               if ((i&0x0007) == 0) \r
                        par[i>>3] = 0;\r
                par[i>>3] |= (((filter(pcs->odd) ^ oddparity8(bt)) & 0x01)<<(7-(i&0x0007)));\r
        }       \r
-       return;\r
 }\r
 \r
 uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {\r
        uint8_t bt = 0;\r
-       int i;\r
-\r
-       for (i = 0; i < 4; i++)\r
-               bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, i)) << i;\r
-               \r
+       bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 0)) << 0;\r
+       bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 1)) << 1;\r
+       bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 2)) << 2;\r
+       bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 3)) << 3;\r
        return bt;\r
 }\r
 \r
@@ -78,7 +76,6 @@ int mifare_sendcmd(uint8_t cmd, uint8_t* data, uint8_t data_size, uint8_t* answe
        if(!len) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR)   Dbprintf("%02X Cmd failed. Card timeout.", cmd);\r
                        len = ReaderReceive(answer,answer_parity);\r
-               //return 0;\r
     }\r
        return len;\r
 }\r
@@ -86,9 +83,10 @@ int mifare_sendcmd(uint8_t cmd, uint8_t* data, uint8_t data_size, uint8_t* answe
 // send 2 byte commands\r
 int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)\r
 {\r
-       uint8_t dcmd[4], ecmd[4];\r
+       uint8_t dcmd[4] = {0x00};\r
+       uint8_t ecmd[4] = {0x00};\r
        uint16_t pos, res;\r
-       uint8_t par[1];                 // 1 Byte parity is enough here\r
+       uint8_t par[1] = {0x00};                        // 1 Byte parity is enough here\r
        dcmd[0] = cmd;\r
        dcmd[1] = data;\r
        AppendCrc14443a(dcmd, 2);\r
@@ -97,8 +95,7 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
        \r
        if (crypted) {\r
                par[0] = 0;\r
-               for (pos = 0; pos < 4; pos++)\r
-               {\r
+               for (pos = 0; pos < 4; pos++) {\r
                        ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];\r
                        par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7-pos));\r
                }       \r
@@ -116,16 +113,15 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
        if (crypted == CRYPT_ALL) {\r
                if (len == 1) {\r
                        res = 0;\r
-                       for (pos = 0; pos < 4; pos++)\r
-                               res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], pos)) << pos;\r
-                               \r
+                       res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 0)) << 0;\r
+                       res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 1)) << 1;\r
+                       res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 2)) << 2;\r
+                       res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 3)) << 3;\r
                        answer[0] = res;\r
                        \r
                } else {\r
                        for (pos = 0; pos < len; pos++)\r
-                       {\r
                                answer[pos] = crypto1_byte(pcs, 0x00, 0) ^ answer[pos];\r
-                       }\r
                }\r
        }\r
        \r
@@ -143,26 +139,24 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
        // variables\r
        int len;        \r
        uint32_t pos;\r
-       uint8_t tmp4[4];\r
+       uint8_t tmp4[4] = {0x00};\r
        uint8_t par[1] = {0x00};\r
-       byte_t nr[4];\r
+\r
+       // "random" reader nonce:\r
+       byte_t nr[4] = {0x55, 0x41, 0x49, 0x92};\r
+       //byte_t nr[4] = {0x01, 0x01, 0x01, 0x01};\r
+       \r
        uint32_t nt, ntpp; // Supplied tag nonce\r
        \r
        uint8_t mf_nr_ar[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };\r
-       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
+       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};\r
+       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};\r
        \r
        // Transmit MIFARE_CLASSIC_AUTH\r
        len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer, receivedAnswerPar, timing);\r
        if (MF_DBGLEVEL >= 4)   Dbprintf("rand tag nonce len: %x", len);  \r
        if (len != 4) return 1;\r
        \r
-       // "random" reader nonce:\r
-       nr[0] = 0x55;\r
-       nr[1] = 0x41;\r
-       nr[2] = 0x49;\r
-       nr[3] = 0x92; \r
-       \r
        // Save the tag nonce (nt)\r
        nt = bytes_to_num(receivedAnswer, 4);\r
 \r
@@ -191,8 +185,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 \r
        // Generate (encrypted) nr+parity by loading it into the cipher (Nr)\r
        par[0] = 0;\r
-       for (pos = 0; pos < 4; pos++)\r
-       {\r
+       for (pos = 0; pos < 4; pos++) {\r
                mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];\r
                par[0] |= (((filter(pcs->odd) ^ oddparity8(nr[pos])) & 0x01) << (7-pos));\r
        }       \r
@@ -201,8 +194,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
        nt = prng_successor(nt,32);\r
 \r
        //  ar+parity\r
-       for (pos = 4; pos < 8; pos++)\r
-       {\r
+       for (pos = 4; pos < 8; pos++) {\r
                nt = prng_successor(nt,8);\r
                mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);\r
                par[0] |= (((filter(pcs->odd) ^ oddparity8(nt & 0xff)) & 0x01) << (7-pos));\r
@@ -213,8 +205,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 \r
        // Receive 4 byte tag answer\r
        len = ReaderReceive(receivedAnswer, receivedAnswerPar);\r
-       if (!len)\r
-       {\r
+       if (!len) {\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Card timeout.");\r
                return 2;\r
        }\r
@@ -226,7 +217,6 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
                if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Error card response.");\r
                return 3;\r
        }\r
-\r
        return 0;\r
 }\r
 \r
@@ -234,10 +224,10 @@ int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blo
 {\r
        // variables\r
        int len;        \r
-       uint8_t bt[2];\r
+       uint8_t bt[2] = {0x00};\r
        \r
-       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
+       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};\r
+       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};\r
        \r
        // command MIFARE_CLASSIC_READBLOCK\r
        len = mifare_sendcmd_short(pcs, 1, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r
@@ -265,13 +255,14 @@ int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blo
 int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){\r
 \r
        uint16_t len;\r
-       uint8_t resp[4];\r
-       uint8_t respPar[1];\r
+       uint8_t resp[4] = {0x00};\r
+       uint8_t respPar[1] = {0x00};\r
        uint8_t key[4] = {0x00};\r
        memcpy(key, keybytes, 4);\r
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r
                Dbprintf("EV1 Auth : %02x%02x%02x%02x", key[0], key[1], key[2], key[3]);\r
+       \r
        len = mifare_sendcmd(0x1B, key, sizeof(key), resp, respPar, NULL);\r
 \r
        if (len != 4) {\r
@@ -375,11 +366,10 @@ int mifare_ultra_auth(uint8_t *keybytes){
 int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData)\r
 {\r
        uint16_t len;\r
-       uint8_t bt[2];\r
-       uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r
+       uint8_t bt[2] = {0x00};\r
+       uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};\r
+       uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};\r
        \r
-\r
        len = mifare_sendcmd_short(NULL, 1, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r
        if (len == 1) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
@@ -404,14 +394,14 @@ int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData)
 int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) \r
 {\r
        // variables\r
-       uint16_t len, i;        \r
+       uint16_t len;   \r
        uint32_t pos = 0;\r
        uint8_t par[3] = {0x00};                // enough for 18 Bytes to send\r
        byte_t res = 0;\r
        \r
        uint8_t d_block[18], d_block_enc[18];\r
-       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
+       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};\r
+       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};\r
        \r
        // command MIFARE_CLASSIC_WRITEBLOCK\r
        len = mifare_sendcmd_short(pcs, 1, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r
@@ -425,8 +415,7 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
        AppendCrc14443a(d_block, 16);\r
        \r
        // crypto\r
-       for (pos = 0; pos < 18; pos++)\r
-       {\r
+       for (pos = 0; pos < 18; pos++) {\r
                d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];\r
                par[pos>>3] |= (((filter(pcs->odd) ^ oddparity8(d_block[pos])) & 0x01) << (7 - (pos&0x0007)));\r
        }       \r
@@ -437,8 +426,10 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
        len = ReaderReceive(receivedAnswer, receivedAnswerPar); \r
 \r
        res = 0;\r
-       for (i = 0; i < 4; i++)\r
-               res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], i)) << i;\r
+       res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 0)) << 0;\r
+       res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 1)) << 1;\r
+       res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 2)) << 2;\r
+       res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 3)) << 3;\r
 \r
        if ((len != 1) || (res != 0x0A)) {\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd send data2 Error: %02x", res);  \r
@@ -485,8 +476,8 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)
 {\r
     uint16_t len;\r
        uint8_t d_block[5] = {0x00};\r
-       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
+       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};\r
+       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};\r
 \r
     // command MIFARE_CLASSIC_WRITEBLOCK\r
        d_block[0]= blockNo;\r
@@ -504,8 +495,8 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)
 }\r
 int mifare_classic_halt_ex(struct Crypto1State *pcs) {\r
        uint16_t len;   \r
-       uint8_t receivedAnswer[4];\r
-       uint8_t receivedAnswerPar[4];\r
+       uint8_t receivedAnswer[4] = {0x00};\r
+       uint8_t receivedAnswerPar[4] = {0x00};\r
 \r
        len = mifare_sendcmd_short(pcs, pcs == NULL ? false:true, 0x50, 0x00, receivedAnswer, receivedAnswerPar, NULL);\r
        if (len != 0) {\r
@@ -521,8 +512,8 @@ int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) {
 int mifare_ultra_halt()\r
 {\r
        uint16_t len;\r
-       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
+       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};\r
+       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};\r
     \r
        len = mifare_sendcmd_short(NULL, true, 0x50, 0x00, receivedAnswer, receivedAnswerPar, NULL);\r
        if (len != 0) {\r
@@ -540,8 +531,7 @@ uint8_t NumBlocksPerSector(uint8_t sectorNo)
 {\r
        if (sectorNo < 32) \r
                return 4;\r
-       else\r
-               return 16;\r
+       return 16;\r
 }\r
 \r
 uint8_t FirstBlockOfSector(uint8_t sectorNo) \r
@@ -593,9 +583,8 @@ int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {
        uint8_t* emCARD = BigBuf_get_EM_addr();\r
        uint8_t* data = emCARD + blockNum * 16;\r
        \r
-       if (emlCheckValBl(blockNum)) {\r
+       if (emlCheckValBl(blockNum))\r
                return 1;\r
-       }\r
        \r
        memcpy(blReg, data, 4);\r
        *blBlock = data[12];\r
@@ -620,7 +609,7 @@ int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {
 }\r
 \r
 uint64_t emlGetKey(int sectorNum, int keyType) {\r
-       uint8_t key[6];\r
+       uint8_t key[6] = {0x00};\r
        uint8_t* emCARD = BigBuf_get_EM_addr();\r
        \r
        memcpy(key, emCARD + 16 * (FirstBlockOfSector(sectorNum) + NumBlocksPerSector(sectorNum) - 1) + keyType * 10, 6);\r
@@ -637,9 +626,8 @@ void emlClearMem(void) {
        memset(emCARD, 0, CARD_MEMORY_SIZE);\r
        \r
        // fill sectors trailer data\r
-       for(b = 3; b < 256; b<127?(b+=4):(b+=16)) {\r
+       for(b = 3; b < 256; b<127?(b+=4):(b+=16))\r
                emlSetMem((uint8_t *)trailer, b , 1);\r
-       }       \r
 \r
        // uid\r
        emlSetMem((uint8_t *)uid, 0, 1);\r
@@ -687,8 +675,8 @@ int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData){
        int len;\r
        // load key, keynumber\r
        uint8_t data[2]={0x0a, 0x00};\r
-       uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r
+       uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};\r
+       uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};\r
        \r
        len = mifare_sendcmd_special(NULL, 1, 0x02, data, receivedAnswer,receivedAnswerPar,NULL);\r
        if (len == 1) {\r
@@ -717,8 +705,8 @@ int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){
        data[0] = 0xAF;\r
        memcpy(data+1,key,16);\r
        \r
-       uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r
+       uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};\r
+       uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};\r
        \r
        len = mifare_sendcmd_special2(NULL, 1, 0x03, data, receivedAnswer, receivedAnswerPar ,NULL);\r
        \r