FIX: `hf mf sim` - authentication works again.

[proxmark3-svn] / armsrc / mifareutil.c

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 4795a7ec4cfa3ce7a9009947c138a425db3e6c57..5d4aa88dc091ed08295654e84318bf981bcd77cd 100644 (file)
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -121,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
@@ -154,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
@@ -564,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