FIX: removing compiler warning about double const.

[proxmark3-svn] / armsrc / mifareutil.c

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index bae4761d3f29ff5fc73b46545023d58379d6f894..d26d71ee6e8ba8a56ef00654d3bae538bba7820e 100644 (file)
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -8,18 +8,7 @@
 //-----------------------------------------------------------------------------\r
 // Work with mifare cards.\r
 //-----------------------------------------------------------------------------\r
-\r
-#include "proxmark3.h"\r
-#include "apps.h"\r
-#include "util.h"\r
-#include "string.h"\r
-\r
-#include "iso14443crc.h"\r
-#include "iso14443a.h"\r
-#include "crapto1.h"\r
 #include "mifareutil.h"\r
-#include "parity.h"\r
-#include "des.h"\r
 \r
 int MF_DBGLEVEL = MF_DBG_ALL;\r
 \r
@@ -132,7 +121,10 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 \r
        // "random" reader nonce:\r
        //byte_t nr[4] = {0x55, 0x41, 0x49, 0x92};\r
-       byte_t nr[4] = {0x01, 0x01, 0x01, 0x01};\r
+       fast_prand();\r
+       byte_t nr[4];\r
+       num_to_bytes(prand(), 4, nr);\r
+       //byte_t nr[4] = {0x01, 0x01, 0x01, 0x01};\r
        \r
        uint32_t nt, ntpp; // Supplied tag nonce\r
        \r
@@ -165,7 +157,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 \r
        // some statistic\r
        if (!ntptr && (MF_DBGLEVEL >= 3))\r
-               Dbprintf("auth uid: %08x nt: %08x", uid, nt);  \r
+               Dbprintf("auth uid: %08x | nr: %08x | nt: %08x", uid, nr, nt);\r
        \r
        // save Nt\r
        if (ntptr)\r
@@ -179,7 +171,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
        }       \r
                \r
        // Skip 32 bits in pseudo random generator\r
-       nt = prng_successor(nt,32);\r
+       nt = prng_successor(nt, 32);\r
 \r
        //  ar+parity\r
        for (pos = 4; pos < 8; pos++) {\r
@@ -287,7 +279,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
        memcpy(enc_random_b,resp+1,8);\r
 \r
        // decrypt nonce.\r
-       tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );\r
+       tdes_2key_dec((void*)random_b, (void*)enc_random_b, sizeof(random_b), (const void*)key, IV );\r
        rol(random_b,8);\r
        memcpy(rnd_ab  ,random_a,8);\r
        memcpy(rnd_ab+8,random_b,8);\r
@@ -470,11 +462,10 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData) {
     return 0;\r
 }\r
 int mifare_classic_halt_ex(struct Crypto1State *pcs) {\r
-       uint16_t len = 0;       \r
        uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};\r
-       len = mifare_sendcmd_short(pcs, (pcs == NULL) ? CRYPT_NONE : CRYPT_ALL, 0x50, 0x00, receivedAnswer, NULL, NULL);\r
+       uint16_t len = mifare_sendcmd_short(pcs, (pcs == NULL) ? CRYPT_NONE : CRYPT_ALL, 0x50, 0x00, receivedAnswer, NULL, NULL);\r
        if (len != 0) {\r
-               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("halt error. response len: %x", len);  \r
+               if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("halt warning. response len: %x", len);\r
                return 1;\r
        }\r
        return 0;\r
@@ -576,23 +567,19 @@ int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {
 uint64_t emlGetKey(int sectorNum, int keyType) {\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
        return bytes_to_num(key, 6);\r
 }\r
 \r
 void emlClearMem(void) {\r
-       int b;\r
-       \r
        const uint8_t trailer[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x80, 0x69, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};\r
        const uint8_t uid[]   =   {0xe6, 0x84, 0x87, 0xf3, 0x16, 0x88, 0x04, 0x00, 0x46, 0x8e, 0x45, 0x55, 0x4d, 0x70, 0x41, 0x04};\r
        uint8_t* emCARD = BigBuf_get_EM_addr();\r
-       \r
        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
-               emlSetMem((uint8_t *)trailer, b , 1);\r
+       for(uint8_t b = 3; b < 256; ((b < 127) ? (b += 4) : (b += 16)))\r
+               emlSetMem((uint8_t *)trailer, b, 1);\r
 \r
        // uid\r
        emlSetMem((uint8_t *)uid, 0, 1);\r