]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/mifarecmd.c
CHG: moved to header file
[proxmark3-svn] / armsrc / mifarecmd.c
index 1e42d5b45875e097cb2c753bde2f2169e4286a27..f906099cfd49150eca93c88f20848807fdbe4fe1 100644 (file)
@@ -4,7 +4,7 @@
 // Hagen Fritsch - June 2010\r
 // Midnitesnake - Dec 2013\r
 // Andy Davies  - Apr 2014\r
-// Iceman - May 2014\r
+// Iceman - May 2014,2015,2016\r
 //\r
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,\r
 // at your option, any later version. See the LICENSE.txt file for the text of\r
@@ -18,6 +18,7 @@
 #include "util.h"\r
 #include "crc.h"\r
 #include "protocols.h"\r
+#include "parity.h"\r
 \r
 //-----------------------------------------------------------------------------\r
 // Select, Authenticate, Read a MIFARE tag. \r
@@ -33,9 +34,9 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        \r
        // variables\r
        byte_t isOK = 0;\r
-       byte_t dataoutbuf[16];\r
-       uint8_t uid[10];\r
-       uint32_t cuid;\r
+       byte_t dataoutbuf[16] = {0x00};\r
+       uint8_t uid[10] = {0x00};\r
+       uint32_t cuid = 0;\r
        struct Crypto1State mpcs = {0, 0};\r
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r
@@ -43,13 +44,14 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        clear_trace();\r
+       set_tracing(true);\r
 \r
        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r
 \r
        while (true) {\r
-               if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
+               if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
                        if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
                        break;\r
                };\r
@@ -73,7 +75,6 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                break;\r
        }\r
        \r
-       //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r
        \r
        if (MF_DBGLEVEL >= 2)   DbpString("READ BLOCK FINISHED");\r
@@ -95,8 +96,9 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        clear_trace();\r
+       set_tracing(true);\r
 \r
-       if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
+       if(!iso14443a_select_card(NULL, NULL, NULL, true, 0)) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");\r
                OnError(0);\r
                return;\r
@@ -130,8 +132,9 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        clear_trace();\r
+       set_tracing(true);\r
 \r
-       int len = iso14443a_select_card(NULL, NULL, NULL);\r
+       int len = iso14443a_select_card(NULL, NULL, NULL, true, 0);\r
        if(!len) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);\r
                OnError(1);\r
@@ -192,8 +195,8 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        // variables\r
        byte_t isOK = 0;\r
        byte_t dataoutbuf[16 * 16];\r
-       uint8_t uid[10];\r
-       uint32_t cuid;\r
+       uint8_t uid[10] = {0x00};\r
+       uint32_t cuid = 0;\r
        struct Crypto1State mpcs = {0, 0};\r
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r
@@ -201,13 +204,14 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        clear_trace();\r
-\r
+       set_tracing(true);\r
+       \r
        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r
 \r
        isOK = 1;\r
-       if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
+       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
                isOK = 0;\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
        }\r
@@ -230,18 +234,17 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
        }\r
 \r
-       //  ----------------------------- crypto1 destroy\r
-       crypto1_destroy(pcs);\r
-       \r
        if (MF_DBGLEVEL >= 2) DbpString("READ SECTOR FINISHED");\r
 \r
+       crypto1_destroy(pcs);\r
+\r
        LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16*NumBlocksPerSector(sectorNo));\r
        LED_B_OFF();\r
 \r
-       // Thats it...\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
+       set_tracing(FALSE);\r
 }\r
 \r
 // arg0 = blockNo (start)\r
@@ -255,9 +258,10 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        // free eventually allocated BigBuf memory\r
-       BigBuf_free();\r
+       BigBuf_free(); BigBuf_Clear_ext(false);\r
        clear_trace();\r
-\r
+       set_tracing(true);\r
+       \r
        // params\r
        uint8_t blockNo = arg0;\r
        uint16_t blocks = arg1;\r
@@ -271,7 +275,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
                return;\r
        }\r
 \r
-       int len = iso14443a_select_card(NULL, NULL, NULL);\r
+       int len = iso14443a_select_card(NULL, NULL, NULL, true, 0);\r
        if (!len) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%d)",len);\r
                OnError(1);\r
@@ -339,6 +343,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
        BigBuf_free();\r
+       set_tracing(FALSE);\r
 }\r
 \r
 //-----------------------------------------------------------------------------\r
@@ -351,15 +356,15 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        uint8_t blockNo = arg0;\r
        uint8_t keyType = arg1;\r
        uint64_t ui64Key = 0;\r
-       byte_t blockdata[16];\r
+       byte_t blockdata[16] = {0x00};\r
 \r
        ui64Key = bytes_to_num(datain, 6);\r
        memcpy(blockdata, datain + 10, 16);\r
        \r
        // variables\r
        byte_t isOK = 0;\r
-       uint8_t uid[10];\r
-       uint32_t cuid;\r
+       uint8_t uid[10] = {0x00};\r
+       uint32_t cuid = 0;\r
        struct Crypto1State mpcs = {0, 0};\r
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r
@@ -367,13 +372,14 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        clear_trace();\r
-\r
+       set_tracing(true);\r
+       \r
        LED_A_ON();\r
        LED_B_OFF();\r
        LED_C_OFF();\r
 \r
        while (true) {\r
-                       if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
+               if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
                        if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
                        break;\r
                };\r
@@ -397,19 +403,15 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                break;\r
        }\r
        \r
-       //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r
        \r
        if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
 \r
-       LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
-       LED_B_OFF();\r
-\r
 \r
-       // Thats it...\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
+       set_tracing(FALSE);\r
 }\r
 \r
 /* // Command not needed but left for future testing \r
@@ -425,9 +427,10 @@ void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)
        LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
 \r
        clear_trace();\r
+       set_tracing(true);\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
-       if(!iso14443a_select_card(uid, NULL, NULL)) {\r
+       if(!iso14443a_select_card(uid, NULL, NULL, true, 0)) {\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
                OnError(0);\r
                return;\r
@@ -472,8 +475,9 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        clear_trace();\r
-\r
-       if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
+       set_tracing(true);\r
+       \r
+       if(!iso14443a_select_card(NULL, NULL, NULL, true, 0)) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
                OnError(0);\r
                return;\r
@@ -518,6 +522,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
        cmd_send(CMD_ACK,1,0,0,0,0);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
+       set_tracing(FALSE);\r
 }\r
 \r
 void MifareUSetPwd(uint8_t arg0, uint8_t *datain){\r
@@ -531,8 +536,9 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        clear_trace();\r
-\r
-       if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
+       set_tracing(true);\r
+       \r
+       if(!iso14443a_select_card(NULL, NULL, NULL, true, 0)) {\r
                if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
                OnError(0);\r
                return;\r
@@ -587,13 +593,145 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
        cmd_send(CMD_ACK,1,0,0,0,0);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
+       set_tracing(FALSE);\r
 }\r
 \r
 // Return 1 if the nonce is invalid else return 0\r
 int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {\r
-       return ((oddparity((Nt >> 24) & 0xFF) == ((parity[0]) ^ oddparity((NtEnc >> 24) & 0xFF) ^ BIT(Ks1,16))) & \\r
-       (oddparity((Nt >> 16) & 0xFF) == ((parity[1]) ^ oddparity((NtEnc >> 16) & 0xFF) ^ BIT(Ks1,8))) & \\r
-       (oddparity((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity((NtEnc >> 8) & 0xFF) ^ BIT(Ks1,0)))) ? 1 : 0;\r
+       return ((oddparity8((Nt >> 24) & 0xFF) == ((parity[0]) ^ oddparity8((NtEnc >> 24) & 0xFF) ^ BIT(Ks1,16))) & \\r
+       (oddparity8((Nt >> 16) & 0xFF) == ((parity[1]) ^ oddparity8((NtEnc >> 16) & 0xFF) ^ BIT(Ks1,8))) & \\r
+       (oddparity8((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity8((NtEnc >> 8) & 0xFF) ^ BIT(Ks1,0)))) ? 1 : 0;\r
+}\r
+\r
+\r
+//-----------------------------------------------------------------------------\r
+// acquire encrypted nonces in order to perform the attack described in\r
+// Carlo Meijer, Roel Verdult, "Ciphertext-only Cryptanalysis on Hardened\r
+// Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on \r
+// Computer and Communications Security, 2015\r
+//-----------------------------------------------------------------------------\r
+#define AUTHENTICATION_TIMEOUT  848 //848                      // card times out 1ms after wrong authentication (according to NXP documentation)\r
+#define PRE_AUTHENTICATION_LEADTIME 400                // some (non standard) cards need a pause after select before they are ready for first authentication \r
+\r
+void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain)\r
+{\r
+       uint64_t ui64Key = 0;\r
+       uint8_t uid[10] = {0x00};\r
+       uint32_t cuid = 0;\r
+       uint8_t cascade_levels = 0;\r
+       struct Crypto1State mpcs = {0, 0};\r
+       struct Crypto1State *pcs;\r
+       pcs = &mpcs;\r
+       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};\r
+       int16_t isOK = 0;\r
+       uint8_t par_enc[1] = {0x00};\r
+       uint8_t nt_par_enc = 0;\r
+       uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};\r
+       uint32_t timeout = 0;\r
+       \r
+       uint8_t blockNo = arg0 & 0xff;\r
+       uint8_t keyType = (arg0 >> 8) & 0xff;\r
+       uint8_t targetBlockNo = arg1 & 0xff;\r
+       uint8_t targetKeyType = (arg1 >> 8) & 0xff;\r
+       ui64Key = bytes_to_num(datain, 6);\r
+       bool initialize = flags & 0x0001;\r
+       bool slow = flags & 0x0002;\r
+       bool field_off = flags & 0x0004;\r
+       \r
+       LED_A_ON();\r
+       LED_C_OFF();\r
+\r
+       BigBuf_free(); BigBuf_Clear_ext(false); \r
+       clear_trace();\r
+       set_tracing(FALSE);\r
+       \r
+       if (initialize) {\r
+               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+       }\r
+       \r
+       LED_C_ON();\r
+       \r
+       uint8_t dummy_answer = 0;       \r
+       uint16_t num_nonces = 0;\r
+       bool have_uid = false;\r
+       for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) {\r
+\r
+               // Test if the action was cancelled\r
+               if(BUTTON_PRESS()) {\r
+                       isOK = 2;\r
+                       field_off = true;\r
+                       break;\r
+               }\r
+\r
+               if (!have_uid) { // need a full select cycle to get the uid first\r
+                       iso14a_card_select_t card_info;         \r
+                       if(!iso14443a_select_card(uid, &card_info, &cuid, true, 0)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("AcquireNonces: Can't select card (ALL)");\r
+                               continue;\r
+                       }\r
+                       switch (card_info.uidlen) {\r
+                               case 4 : cascade_levels = 1; break;\r
+                               case 7 : cascade_levels = 2; break;\r
+                               case 10: cascade_levels = 3; break;\r
+                               default: break;\r
+                       }\r
+                       have_uid = true;        \r
+               } else { // no need for anticollision. We can directly select the card\r
+                       if(!iso14443a_select_card(uid, NULL, NULL, false, cascade_levels)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("AcquireNonces: Can't select card (UID)");\r
+                               continue;\r
+                       }\r
+               }\r
+               \r
+               if (slow) {\r
+                       timeout = GetCountSspClk() + PRE_AUTHENTICATION_LEADTIME;\r
+                       while(GetCountSspClk() < timeout);\r
+               }\r
+\r
+               uint32_t nt1;\r
+               if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, NULL)) {\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("AcquireNonces: Auth1 error");\r
+                       continue;\r
+               }\r
+\r
+               // nested authentication\r
+               uint16_t len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par_enc, NULL);\r
+               if (len != 4) {\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("AcquireNonces: Auth2 error len=%d", len);\r
+                       continue;\r
+               }\r
+       \r
+               // send a dummy byte as reader response in order to trigger the cards authentication timeout\r
+               ReaderTransmit(&dummy_answer, 1, NULL);\r
+               timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT;\r
+               \r
+               num_nonces++;\r
+               if (num_nonces % 2) {\r
+                       memcpy(buf+i, receivedAnswer, 4);\r
+                       nt_par_enc = par_enc[0] & 0xf0;\r
+               } else {\r
+                       nt_par_enc |= par_enc[0]  >> 4;\r
+                       memcpy(buf+i+4, receivedAnswer, 4);\r
+                       memcpy(buf+i+8, &nt_par_enc, 1);\r
+                       i += 9;\r
+               }\r
+               // wait for the card to become ready again\r
+               while(GetCountSspClk() < timeout);      \r
+       }\r
+\r
+       LED_C_OFF();\r
+       crypto1_destroy(pcs);   \r
+       LED_B_ON();\r
+       cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));\r
+       LED_B_OFF();\r
+\r
+       if (MF_DBGLEVEL >= 3)   DbpString("AcquireEncryptedNonces finished");\r
+\r
+       if (field_off) {\r
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+               LEDsoff();\r
+               set_tracing(FALSE);\r
+       }\r
 }\r
 \r
 \r
@@ -614,30 +752,30 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
        \r
        // variables\r
        uint16_t rtr, i, j, len;\r
-       uint16_t davg;\r
+       uint16_t davg = 0;\r
        static uint16_t dmin, dmax;\r
-       uint8_t uid[10];\r
-       uint32_t cuid, nt1, nt2, nttmp, nttest, ks1;\r
-       uint8_t par[1];\r
-       uint32_t target_nt[2], target_ks[2];\r
+       uint8_t uid[10] = {0x00};\r
+       uint32_t cuid = 0, nt1, nt2, nttmp, nttest, ks1;\r
+       uint8_t par[1] = {0x00};\r
+       uint32_t target_nt[2] = {0x00}, target_ks[2] = {0x00};\r
        \r
-       uint8_t par_array[4];\r
+       uint8_t par_array[4] = {0x00};\r
        uint16_t ncount = 0;\r
        struct Crypto1State mpcs = {0, 0};\r
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r
-       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
+       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};\r
 \r
        uint32_t auth1_time, auth2_time;\r
-       static uint16_t delta_time;\r
+       static uint16_t delta_time = 0;\r
 \r
        LED_A_ON();\r
        LED_C_OFF();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
        // free eventually allocated BigBuf memory\r
-       BigBuf_free();\r
-\r
+       BigBuf_free(); BigBuf_Clear_ext(false);\r
+       \r
        if (calibrate) clear_trace();\r
        set_tracing(true);\r
 \r
@@ -668,7 +806,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                                continue;\r
                        }\r
 \r
-                       if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
+                       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Can't select card");\r
                                rtr--;\r
                                continue;\r
@@ -680,12 +818,8 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                                rtr--;\r
                                continue;\r
                        };\r
+                       auth2_time = (delta_time) ? auth1_time + delta_time : 0;\r
 \r
-                       if (delta_time) {\r
-                               auth2_time = auth1_time + delta_time;\r
-                       } else {\r
-                               auth2_time = 0;\r
-                       }\r
                        if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2, &auth2_time)) {\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth2 error");\r
                                rtr--;\r
@@ -741,7 +875,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                                continue;\r
                        }\r
 \r
-                       if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
+                       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Can't select card");\r
                                continue;\r
                        };\r
@@ -754,6 +888,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 \r
                        // nested authentication\r
                        auth2_time = auth1_time + delta_time;\r
+\r
                        len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par, &auth2_time);\r
                        if (len != 4) {\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth2 error len=%d", len);\r
@@ -764,9 +899,13 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                        if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2, par[0]);\r
                        \r
                        // Parity validity check\r
-                       for (j = 0; j < 4; j++) {\r
-                               par_array[j] = (oddparity(receivedAnswer[j]) != ((par[0] >> (7-j)) & 0x01));\r
-                       }\r
+//                     for (j = 0; j < 4; j++) {\r
+//                             par_array[j] = (oddparity8(receivedAnswer[j]) != ((par[0] >> (7-j)) & 0x01));\r
+//                     }\r
+                       par_array[0] = (oddparity8(receivedAnswer[0]) != ((par[0] >> (7-0)) & 0x01));\r
+                       par_array[1] = (oddparity8(receivedAnswer[1]) != ((par[0] >> (7-1)) & 0x01));\r
+                       par_array[2] = (oddparity8(receivedAnswer[2]) != ((par[0] >> (7-2)) & 0x01));\r
+                       par_array[3] = (oddparity8(receivedAnswer[3]) != ((par[0] >> (7-3)) & 0x01));\r
                        \r
                        ncount = 0;\r
                        nttest = prng_successor(nt1, dmin - 1);\r
@@ -797,10 +936,9 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 \r
        LED_C_OFF();\r
        \r
-       //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r
        \r
-       byte_t buf[4 + 4 * 4];\r
+       byte_t buf[4 + 4 * 4] = {0};\r
        memcpy(buf, &cuid, 4);\r
        memcpy(buf+4, &target_nt[0], 4);\r
        memcpy(buf+8, &target_ks[0], 4);\r
@@ -822,68 +960,91 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 // MIFARE check keys. key count up to 85. \r
 // \r
 //-----------------------------------------------------------------------------\r
-void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r
-{\r
-  // params\r
+void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {\r
        uint8_t blockNo = arg0 & 0xff;\r
        uint8_t keyType = (arg0 >> 8) & 0xff;\r
        bool clearTrace = arg1;\r
        uint8_t keyCount = arg2;\r
        uint64_t ui64Key = 0;\r
        \r
-       // variables\r
+       bool have_uid = FALSE;\r
+       uint8_t cascade_levels = 0;\r
+       uint32_t timeout = 0;\r
+       \r
        int i;\r
        byte_t isOK = 0;\r
-       uint8_t uid[10];\r
-       uint32_t cuid;\r
+       uint8_t uid[10] = {0x00};\r
+       uint32_t cuid = 0;\r
        struct Crypto1State mpcs = {0, 0};\r
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r
        \r
-       // clear debug level\r
+       // save old debuglevel, and tempory turn off dbg printing. speedissues.\r
        int OLD_MF_DBGLEVEL = MF_DBGLEVEL;      \r
        MF_DBGLEVEL = MF_DBG_NONE;\r
        \r
+       LEDsoff();\r
        LED_A_ON();\r
-       LED_B_OFF();\r
-       LED_C_OFF();\r
+       \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
-       if (clearTrace) clear_trace();\r
+       if (clearTrace) \r
+               clear_trace();\r
+       \r
        set_tracing(TRUE);\r
+       \r
+       for (i = 0; i < keyCount; ++i) {\r
 \r
-       for (i = 0; i < keyCount; i++) {\r
-               if(mifare_classic_halt(pcs, cuid)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("ChkKeys: Halt error");\r
-               }\r
-\r
-               if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
-                       if (OLD_MF_DBGLEVEL >= 1)       Dbprintf("ChkKeys: Can't select card");\r
-                       break;\r
-               };\r
+               //mifare_classic_halt(pcs, cuid);\r
 \r
+               // this part is from Piwi's faster nonce collecting part in Hardnested.\r
+               if (!have_uid) { // need a full select cycle to get the uid first\r
+                       iso14a_card_select_t card_info;         \r
+                       if(!iso14443a_select_card(uid, &card_info, &cuid, true, 0)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("ChkKeys: Can't select card (ALL)");\r
+                               break;\r
+                       }\r
+                       switch (card_info.uidlen) {\r
+                               case 4 : cascade_levels = 1; break;\r
+                               case 7 : cascade_levels = 2; break;\r
+                               case 10: cascade_levels = 3; break;\r
+                               default: break;\r
+                       }\r
+                       have_uid = TRUE;        \r
+               } else { // no need for anticollision. We can directly select the card\r
+                       if(!iso14443a_select_card(uid, NULL, NULL, false, cascade_levels)) {\r
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("ChkKeys: Can't select card (UID)");\r
+                               continue;\r
+                       }\r
+               }\r
+       \r
                ui64Key = bytes_to_num(datain + i * 6, 6);\r
-               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r
-                       continue;\r
-               };\r
                \r
+               if (mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r
+\r
+                       uint8_t dummy_answer = 0;\r
+                       ReaderTransmit(&dummy_answer, 1, NULL);\r
+                       timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT;\r
+                       \r
+                       // wait for the card to become ready again\r
+                       while(GetCountSspClk() < timeout);\r
+                       \r
+                       continue;\r
+               }\r
                isOK = 1;\r
                break;\r
        }\r
        \r
-       //  ----------------------------- crypto1 destroy\r
-       crypto1_destroy(pcs);\r
-       \r
        LED_B_ON();\r
-    cmd_send(CMD_ACK,isOK,0,0,datain + i * 6,6);\r
-       LED_B_OFF();\r
+    cmd_send(CMD_ACK, isOK, 0, 0, datain + i * 6, 6);\r
 \r
+       // restore debug level\r
+       MF_DBGLEVEL = OLD_MF_DBGLEVEL;  \r
+       \r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
        set_tracing(FALSE);\r
-       \r
-       // restore debug level\r
-       MF_DBGLEVEL = OLD_MF_DBGLEVEL;  \r
+       crypto1_destroy(pcs);\r
 }\r
 \r
 //-----------------------------------------------------------------------------\r
@@ -910,13 +1071,13 @@ void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
 \r
 void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);\r
-       //emlSetMem(datain, arg0, arg1); // data, block num, blocks count        \r
+       if (arg2==0) arg2 = 16; // backwards compat... default bytewidth\r
        emlSetMem_xt(datain, arg0, arg1, arg2); // data, block num, blocks count, block byte width\r
 }\r
 \r
 void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);\r
-       byte_t buf[USB_CMD_DATA_SIZE];\r
+       byte_t buf[USB_CMD_DATA_SIZE] = {0x00};\r
        emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)\r
 \r
        LED_B_ON();\r
@@ -932,15 +1093,15 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        uint8_t numSectors = arg0;\r
        uint8_t keyType = arg1;\r
        uint64_t ui64Key = 0;\r
-       uint32_t cuid;\r
+       uint32_t cuid = 0;\r
        struct Crypto1State mpcs = {0, 0};\r
        struct Crypto1State *pcs;\r
        pcs = &mpcs;\r
 \r
        // variables\r
-       byte_t dataoutbuf[16];\r
-       byte_t dataoutbuf2[16];\r
-       uint8_t uid[10];\r
+       byte_t dataoutbuf[16] = {0x00};\r
+       byte_t dataoutbuf2[16] = {0x00};\r
+       uint8_t uid[10] = {0x00};\r
 \r
        LED_A_ON();\r
        LED_B_OFF();\r
@@ -952,7 +1113,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
        \r
        bool isOK = true;\r
 \r
-       if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
+       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
                isOK = false;\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
        }\r
@@ -978,7 +1139,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
                                isOK = false;\r
                                if (MF_DBGLEVEL >= 1)   Dbprintf("Error reading sector %2d block %2d", sectorNo, blockNo);\r
                                break;\r
-                       };\r
+                       }\r
                        if (isOK) {\r
                                if (blockNo < NumBlocksPerSector(sectorNo) - 1) {\r
                                        emlSetMem(dataoutbuf, FirstBlockOfSector(sectorNo) + blockNo, 1);\r
@@ -992,9 +1153,9 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 \r
        }\r
 \r
-       if(mifare_classic_halt(pcs, cuid)) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-       };\r
+       if(mifare_classic_halt(pcs, cuid))\r
+               if (MF_DBGLEVEL >= 1)\r
+                       Dbprintf("Halt error");\r
 \r
        //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r
@@ -1031,15 +1192,15 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
        uint8_t workFlags = arg0;\r
        uint8_t blockNo = arg1;\r
        \r
-       Dbprintf("ICE :: CSetBlocks Flags %02x", workFlags);\r
-       \r
        // variables\r
+       bool isOK = false; //assume we will get an error\r
+       uint8_t errormsg = 0x00;\r
        uint8_t uid[10] = {0x00};\r
        uint8_t data[18] = {0x00};\r
-       uint32_t cuid;\r
+       uint32_t cuid = 0;\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
        if (workFlags & MAGIC_INIT) {\r
                LED_A_ON();\r
@@ -1049,65 +1210,82 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
                set_tracing(TRUE);\r
        }\r
 \r
-       // read UID and return to client\r
-       if (workFlags & MAGIC_UID) {\r
-               if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
-                       if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("Can't select card");\r
-                       OnErrorMagic(MAGIC_UID);\r
-               };\r
-       };\r
+       //loop doesn't loop just breaks out if error\r
+       while (true) {\r
+               // read UID and return to client with write\r
+               if (workFlags & MAGIC_UID) {\r
+                       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
+                               if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("Can't select card");\r
+                               errormsg = MAGIC_UID;\r
+                       }\r
+                       mifare_classic_halt_ex(NULL);\r
+                       break;\r
+               }\r
        \r
-       // wipe tag, fill it with zeros\r
-       if (workFlags & MAGIC_WIPE){\r
-               ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
-               if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-                       if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("wupC1 error");\r
-                       OnErrorMagic(MAGIC_WIPE);\r
-               };\r
+               // wipe tag, fill it with zeros\r
+               if (workFlags & MAGIC_WIPE){\r
+                       ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);\r
+                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
+                               if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("wupC1 error");\r
+                               errormsg = MAGIC_WIPE;\r
+                               break;\r
+                       }\r
 \r
-               ReaderTransmit(wipeC, sizeof(wipeC), NULL);\r
-               if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-                       if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("wipeC error");\r
-                       OnErrorMagic(MAGIC_WIPE);\r
-               };\r
-       };      \r
+                       ReaderTransmit(wipeC, sizeof(wipeC), NULL);\r
+                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
+                               if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("wipeC error");\r
+                               errormsg = MAGIC_WIPE;\r
+                               break;\r
+                       }\r
 \r
-       // write block\r
-       if (workFlags & MAGIC_WUPC) {\r
-               ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
-               if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-                       if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("wupC1 error");\r
-                       OnErrorMagic(MAGIC_WUPC);\r
-               };\r
+                       mifare_classic_halt_ex(NULL);\r
+               }       \r
 \r
-               ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
-               if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-                       if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("wupC2 error");\r
-                       OnErrorMagic(MAGIC_WUPC);\r
-               };\r
-       }\r
+               // write block\r
+               if (workFlags & MAGIC_WUPC) {\r
+                       ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);\r
+                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
+                               if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("wupC1 error");\r
+                               errormsg = MAGIC_WUPC;\r
+                               break;\r
+                       }\r
 \r
-       if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {\r
-               if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("write block send command error");\r
-               OnErrorMagic(4);\r
-       };\r
-       \r
-       memcpy(data, datain, 16);\r
-       AppendCrc14443a(data, 16);\r
+                       ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
+                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
+                               if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("wupC2 error");\r
+                               errormsg = MAGIC_WUPC;\r
+                               break;\r
+                       }\r
+               }\r
+\r
+               if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {\r
+                       if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("write block send command error");\r
+                       errormsg = 4;\r
+                       break;\r
+               }\r
        \r
-       ReaderTransmit(data, sizeof(data), NULL);\r
-       if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {\r
-               if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("write block send data error");\r
-               OnErrorMagic(0);\r
-       };      \r
+               memcpy(data, datain, 16);\r
+               AppendCrc14443a(data, 16);\r
        \r
-       if (workFlags & MAGIC_OFF) \r
-               mifare_classic_halt_ex(NULL);\r
+               ReaderTransmit(data, sizeof(data), NULL);\r
+               if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {\r
+                       if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("write block send data error");\r
+                       errormsg = 0;\r
+                       break;\r
+               }       \r
        \r
-       LED_B_ON();\r
-       // check if uid is cuid?\r
-       cmd_send(CMD_ACK,1,0,0,uid,sizeof(uid));\r
-       LED_B_OFF();\r
+               if (workFlags & MAGIC_OFF) \r
+                       mifare_classic_halt_ex(NULL);\r
+               \r
+               isOK = true;\r
+               break;\r
+\r
+       } // end while  \r
+\r
+       if (isOK )\r
+               cmd_send(CMD_ACK,1,0,0,uid,sizeof(uid));\r
+       else\r
+               OnErrorMagic(errormsg);\r
 \r
        if (workFlags & MAGIC_OFF)\r
                OnSuccessMagic();\r
@@ -1117,11 +1295,13 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
     \r
        uint8_t workFlags = arg0;\r
        uint8_t blockNo = arg1;\r
-\r
+       uint8_t errormsg = 0x00;\r
+       bool isOK = false; //assume we will get an error\r
+       \r
        // variables\r
        uint8_t data[MAX_MIFARE_FRAME_SIZE];\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
        memset(data, 0x00, sizeof(data));\r
        \r
@@ -1133,42 +1313,51 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
                set_tracing(TRUE);\r
        }\r
 \r
-       if (workFlags & MAGIC_WUPC) {\r
-               ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
-               if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-                       if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");\r
-                       OnErrorMagic(MAGIC_WUPC);\r
-               };\r
+       //loop doesn't loop just breaks out if error or done\r
+       while (true) {\r
+               if (workFlags & MAGIC_WUPC) {\r
+                       ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);\r
+                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
+                               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");\r
+                               errormsg = MAGIC_WUPC;\r
+                               break;\r
+                       }\r
 \r
-               ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
-               if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-                       if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC2 error");\r
-                       OnErrorMagic(MAGIC_WUPC);\r
-               };\r
-       }\r
+                       ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
+                       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
+                               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC2 error");\r
+                               errormsg = MAGIC_WUPC;\r
+                               break;\r
+                       }\r
+               }\r
 \r
-       // read block           \r
-       if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) {\r
-               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("read block send command error");\r
-               OnErrorMagic(0);\r
-       };\r
-       \r
-       memcpy(data, receivedAnswer, sizeof(data));\r
-       \r
-       // send HALT\r
-       if (workFlags & MAGIC_HALT) \r
-               mifare_classic_halt_ex(NULL);\r
-       \r
-       LED_B_ON();\r
-       \r
+               // read block           \r
+               if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) {\r
+                       if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("read block send command error");\r
+                       errormsg = 0;\r
+                       break;\r
+               }\r
+               \r
+               memcpy(data, receivedAnswer, sizeof(data));\r
+               \r
+               // send HALT\r
+               if (workFlags & MAGIC_HALT)\r
+                       mifare_classic_halt_ex(NULL);\r
+\r
+               isOK = true;\r
+               break;\r
+       }\r
        // if MAGIC_DATAIN, the data stays on device side.\r
-       if (workFlags & MAGIC_DATAIN)\r
-               memcpy(datain, data, sizeof(data));\r
-       else\r
-               cmd_send(CMD_ACK,1,0,0,data,sizeof(data));\r
+       if (workFlags & MAGIC_DATAIN) {\r
+               if (isOK)\r
+                       memcpy(datain, data, sizeof(data));\r
+       } else {\r
+               if (isOK) \r
+                       cmd_send(CMD_ACK,1,0,0,data,sizeof(data));      \r
+               else \r
+                       OnErrorMagic(errormsg); \r
+       }\r
        \r
-       LED_B_OFF();\r
-\r
        if (workFlags & MAGIC_OFF)\r
                OnSuccessMagic();\r
 }\r
@@ -1176,19 +1365,19 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
 void MifareCIdent(){\r
        \r
        // variables\r
-       byte_t isOK = 1;        \r
-       uint8_t receivedAnswer[1];\r
-       uint8_t receivedAnswerPar[1];\r
+       bool isOK = true;       \r
+       uint8_t receivedAnswer[1] = {0x00};\r
+       uint8_t receivedAnswerPar[1] = {0x00};\r
 \r
-       ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
+       ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);\r
        if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-               isOK = 0;\r
-       };\r
+               isOK = false;\r
+       }\r
 \r
        ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
        if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-               isOK = 0;\r
-       };\r
+               isOK = false;\r
+       }\r
 \r
        // removed the if,  since some magic tags misbehavies and send an answer to it.\r
        mifare_classic_halt(NULL, 0);\r
@@ -1205,24 +1394,19 @@ void OnErrorMagic(uint8_t reason){
        cmd_send(CMD_ACK,0,reason,0,0,0);\r
        OnSuccessMagic();\r
 }\r
-\r
-void MifareCollectNonces(uint32_t arg0, uint32_t arg1){\r
-}\r
-\r
 //\r
 // DESFIRE\r
 //\r
-\r
 void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){\r
-\r
-       byte_t dataout[11] = {0x00};\r
+       byte_t dataout[12] = {0x00};\r
        uint8_t uid[10] = {0x00};\r
-       uint32_t cuid = 0x00;\r
+       uint32_t cuid = 0;\r
     \r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
        clear_trace();\r
+       set_tracing(true);\r
 \r
-       int len = iso14443a_select_card(uid, NULL, &cuid);\r
+       int len = iso14443a_select_card(uid, NULL, &cuid, true, 0);\r
        if(!len) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");\r
                OnError(1);\r
@@ -1236,11 +1420,10 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
        }\r
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");\r
-    cmd_send(CMD_ACK,1,cuid,0,dataout, sizeof(dataout));\r
+    cmd_send(CMD_ACK, 1, cuid, 0, dataout, sizeof(dataout));\r
 }\r
 \r
 void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){\r
-\r
        uint32_t cuid = arg0;\r
        uint8_t key[16] = {0x00};\r
        byte_t dataout[12] = {0x00};\r
@@ -1261,4 +1444,5 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
        cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
+       set_tracing(FALSE);\r
 }
\ No newline at end of file
Impressum, Datenschutz