]> git.zerfleddert.de Git - proxmark3-svn/commitdiff
Added the changes to armsrc for milfare ultralight C and Desfire commands
authormidnitesnake <midnitesnake@gmail.com>
Sun, 9 Nov 2014 11:30:29 +0000 (11:30 +0000)
committermidnitesnake <midnitesnake@gmail.com>
Sun, 9 Nov 2014 11:30:29 +0000 (11:30 +0000)
armsrc/appmain.c
armsrc/apps.h
armsrc/mifarecmd.c
armsrc/mifarecmd.h
armsrc/mifareutil.c
armsrc/mifareutil.h
include/usb_cmd.h

index f3e61f8b7fd4a4783d049f35135d82d85e1d0faf..947c12ccdb9d474d349c5f2feac1bdc676a4546d 100644 (file)
@@ -801,7 +801,16 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        MifareUReadBlock(c->arg[0],c->d.asBytes);
                        break;
                case CMD_MIFAREU_READCARD:
-                       MifareUReadCard(c->arg[0],c->d.asBytes);
+                        MifareUReadCard(c->arg[0],c->arg[1],c->d.asBytes);
+                        break;
+                case CMD_MIFAREUC_READCARD:
+                        MifareUReadCard(c->arg[0],c->arg[1],c->d.asBytes);
+                        break;
+                case CMD_MIFAREUC_AUTH1:
+                        MifareUC_Auth1(c->arg[0],c->d.asBytes);
+                        break;
+                case CMD_MIFAREUC_AUTH2:
+                        MifareUC_Auth2(c->arg[0],c->d.asBytes);
                         break;
                case CMD_MIFARE_READSC:
                        MifareReadSector(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
@@ -824,7 +833,12 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_SIMULATE_MIFARE_CARD:
                        Mifare1ksim(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;
-               
+               case CMD_MIFARE_DES_AUTH1:
+                        Mifare_DES_Auth1(c->arg[0],c->d.asBytes);
+                        break;
+                case CMD_MIFARE_DES_AUTH2:
+                        Mifare_DES_Auth2(c->arg[0],c->d.asBytes);
+                        break;         
                // emulator
                case CMD_MIFARE_SET_DBGMODE:
                        MifareSetDbgLvl(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
index 083d5b438391546f7f17a1b13ac8de07343a6817..bf298a79ed63dcadf60e0582e2ec8aa25a22661a 100644 (file)
@@ -171,12 +171,8 @@ void EPA_PACE_Collect_Nonce(UsbCommand * c);
 void ReaderMifare(bool first_try);
 int32_t dist_nt(uint32_t nt1, uint32_t nt2);
 void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *data);
-void MifareUReadBlock(uint8_t arg0,uint8_t *datain);
-void MifareUReadCard(uint8_t arg0,uint8_t *datain);
 void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
 void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
-void MifareUWriteBlock(uint8_t arg0,uint8_t *datain);
-void MifareUWriteBlock_Special(uint8_t arg0,uint8_t *datain);
 void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
 void Mifare1ksim(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
@@ -187,6 +183,17 @@ void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
 void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);  // Work with "magic Chinese" card
 void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
+//ultralight
+void MifareUReadBlock(uint8_t arg0,uint8_t *datain);
+void MifareUC_Auth1(uint8_t arg0, uint8_t *datain);
+void MifareUC_Auth2(uint32_t arg0, uint8_t *datain);
+void MifareUReadCard(uint8_t arg0,int Pages,uint8_t *datain);
+void MifareUCReadCard(uint8_t arg0,int Pages,uint8_t *datain);
+void MifareUWriteBlock(uint8_t arg0,uint8_t *datain);
+void MifareUWriteBlock_Special(uint8_t arg0,uint8_t *datain);
+//desfire
+void Mifare_DES_Auth1(uint8_t arg0,uint8_t *datain);
+void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain);
 
 /// iso15693.h
 void RecordRawAdcSamplesIso15693(void);
index 6a491b532a73739aaf9da9540fe5014fab2bbe91..981a00e945945e641af9976b7811bea128d373f4 100644 (file)
-//-----------------------------------------------------------------------------\r
-// Merlok - June 2011, 2012\r
-// Gerhard de Koning Gans - May 2008\r
-// Hagen Fritsch - June 2010\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
-// the license.\r
-//-----------------------------------------------------------------------------\r
-// Routines to support ISO 14443 type A.\r
-//-----------------------------------------------------------------------------\r
-\r
-#include "mifarecmd.h"\r
-#include "apps.h"\r
-\r
-//-----------------------------------------------------------------------------\r
-// Select, Authenticaate, Read an MIFARE tag. \r
-// read block\r
-//-----------------------------------------------------------------------------\r
-void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r
-{\r
-  // params\r
-       uint8_t blockNo = arg0;\r
-       uint8_t keyType = arg1;\r
-       uint64_t ui64Key = 0;\r
-       ui64Key = bytes_to_num(datain, 6);\r
-       \r
-       // variables\r
-       byte_t isOK = 0;\r
-       byte_t dataoutbuf[16];\r
-       uint8_t uid[10];\r
-       uint32_t cuid;\r
-       struct Crypto1State mpcs = {0, 0};\r
-       struct Crypto1State *pcs;\r
-       pcs = &mpcs;\r
-\r
-       // clear trace\r
-       iso14a_clear_trace();\r
-//     iso14a_set_tracing(false);\r
-\r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\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 (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
-                       break;\r
-               };\r
-\r
-               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
-                       break;\r
-               };\r
-               \r
-               if(mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block error");\r
-                       break;\r
-               };\r
-\r
-               if(mifare_classic_halt(pcs, cuid)) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                       break;\r
-               };\r
-               \r
-               isOK = 1;\r
-               break;\r
-       }\r
-       \r
-       //  ----------------------------- crypto1 destroy\r
-       crypto1_destroy(pcs);\r
-       \r
-       if (MF_DBGLEVEL >= 2)   DbpString("READ BLOCK FINISHED");\r
-\r
-       // add trace trailer\r
-       memset(uid, 0x44, 4);\r
-       LogTrace(uid, 4, 0, 0, TRUE);\r
-\r
-//     UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};\r
-//     memcpy(ack.d.asBytes, dataoutbuf, 16);\r
-       \r
-       LED_B_ON();\r
-  cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);\r
-//     UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));\r
-       LED_B_OFF();\r
-\r
-\r
-  // Thats it...\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-       LEDsoff();\r
-//  iso14a_set_tracing(TRUE);\r
-\r
-}\r
-\r
-void MifareUReadBlock(uint8_t arg0,uint8_t *datain)\r
-{\r
-    // params\r
-       uint8_t blockNo = arg0;\r
-       \r
-       // variables\r
-       byte_t isOK = 0;\r
-       byte_t dataoutbuf[16];\r
-       uint8_t uid[10];\r
-       uint32_t cuid;\r
-    \r
-       // clear trace\r
-       iso14a_clear_trace();\r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\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 (MF_DBGLEVEL >= 1)      Dbprintf("Can't select card");\r
-                       break;\r
-               };\r
-        \r
-               if(mifare_ultra_readblock(cuid, blockNo, dataoutbuf)) {\r
-            if (MF_DBGLEVEL >= 1)      Dbprintf("Read block error");\r
-                       break;\r
-               };\r
-        \r
-               if(mifare_ultra_halt(cuid)) {\r
-            if (MF_DBGLEVEL >= 1)      Dbprintf("Halt error");\r
-                       break;\r
-               };\r
-               \r
-               isOK = 1;\r
-               break;\r
-       }\r
-       \r
-       if (MF_DBGLEVEL >= 2)   DbpString("READ BLOCK FINISHED");\r
-    \r
-       // add trace trailer\r
-       memset(uid, 0x44, 4);\r
-       LogTrace(uid, 4, 0, 0, TRUE);\r
-       LED_B_ON();\r
-        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);\r
-       LED_B_OFF();\r
-    \r
-    \r
-    // Thats it...\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-       LEDsoff();\r
-}\r
-\r
-//-----------------------------------------------------------------------------\r
-// Select, Authenticaate, Read an MIFARE tag. \r
-// read sector (data = 4 x 16 bytes = 64 bytes)\r
-//-----------------------------------------------------------------------------\r
-void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r
-{\r
-  // params\r
-       uint8_t sectorNo = arg0;\r
-       uint8_t keyType = arg1;\r
-       uint64_t ui64Key = 0;\r
-       ui64Key = bytes_to_num(datain, 6);\r
-       \r
-       // variables\r
-       byte_t isOK = 0;\r
-       byte_t dataoutbuf[16 * 4];\r
-       uint8_t uid[10];\r
-       uint32_t cuid;\r
-       struct Crypto1State mpcs = {0, 0};\r
-       struct Crypto1State *pcs;\r
-       pcs = &mpcs;\r
-\r
-       // clear trace\r
-       iso14a_clear_trace();\r
-//     iso14a_set_tracing(false);\r
-\r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\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 (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
-                       break;\r
-               };\r
-\r
-               if(mifare_classic_auth(pcs, cuid, sectorNo * 4, keyType, ui64Key, AUTH_FIRST)) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
-                       break;\r
-               };\r
-               \r
-               if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 0, dataoutbuf + 16 * 0)) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 0 error");\r
-                       break;\r
-               };\r
-               if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 1, dataoutbuf + 16 * 1)) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 1 error");\r
-                       break;\r
-               };\r
-               if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 2, dataoutbuf + 16 * 2)) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 2 error");\r
-                       break;\r
-               };\r
-               if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 3, dataoutbuf + 16 * 3)) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 3 error");\r
-                       break;\r
-               };\r
-               \r
-               if(mifare_classic_halt(pcs, cuid)) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                       break;\r
-               };\r
-\r
-               isOK = 1;\r
-               break;\r
-       }\r
-       \r
-       //  ----------------------------- crypto1 destroy\r
-       crypto1_destroy(pcs);\r
-       \r
-       if (MF_DBGLEVEL >= 2) DbpString("READ SECTOR FINISHED");\r
-\r
-       // add trace trailer\r
-       memset(uid, 0x44, 4);\r
-       LogTrace(uid, 4, 0, 0, TRUE);\r
-\r
-//     UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};\r
-//     memcpy(ack.d.asBytes, dataoutbuf, 16 * 2);\r
-       \r
-       LED_B_ON();\r
-  cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,32);\r
-//     UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));\r
-//     SpinDelay(100);\r
-       \r
-//     memcpy(ack.d.asBytes, dataoutbuf + 16 * 2, 16 * 2);\r
-//     UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));\r
-  cmd_send(CMD_ACK,isOK,0,0,dataoutbuf+32, 32);\r
-       LED_B_OFF();\r
-\r
-       // Thats it...\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-       LEDsoff();\r
-//  iso14a_set_tracing(TRUE);\r
-\r
-}\r
-\r
-void MifareUReadCard(uint8_t arg0, uint8_t *datain)\r
-{\r
-  // params\r
-        uint8_t sectorNo = arg0;\r
-        \r
-        // variables\r
-        byte_t isOK = 0;\r
-        byte_t dataoutbuf[16 * 4];\r
-        uint8_t uid[10];\r
-        uint32_t cuid;\r
-\r
-        // clear trace\r
-        iso14a_clear_trace();\r
-//      iso14a_set_tracing(false);\r
-\r
-               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\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 (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
-                        break;\r
-                };\r
-               for(int sec=0;sec<16;sec++){\r
-                    if(mifare_ultra_readblock(cuid, sectorNo * 4 + sec, dataoutbuf + 4 * sec)) {\r
-                    if (MF_DBGLEVEL >= 1)   Dbprintf("Read block %d error",sec);\r
-                        break;\r
-                    };\r
-                }\r
-                if(mifare_ultra_halt(cuid)) {\r
-                if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                        break;\r
-                };\r
-\r
-                isOK = 1;\r
-                break;\r
-        }\r
-        \r
-        if (MF_DBGLEVEL >= 2) DbpString("READ CARD FINISHED");\r
-\r
-        // add trace trailer\r
-        memset(uid, 0x44, 4);\r
-        LogTrace(uid, 4, 0, 0, TRUE);\r
-        \r
-        LED_B_ON();\r
-               cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,64);\r
-  //cmd_send(CMD_ACK,isOK,0,0,dataoutbuf+32, 32);\r
-        LED_B_OFF();\r
-\r
-        // Thats it...\r
-        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-        LEDsoff();\r
-//  iso14a_set_tracing(TRUE);\r
-\r
-}\r
-\r
-\r
-//-----------------------------------------------------------------------------\r
-// Select, Authenticaate, Read an MIFARE tag. \r
-// read block\r
-//-----------------------------------------------------------------------------\r
-void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r
-{\r
-       // params\r
-       uint8_t blockNo = arg0;\r
-       uint8_t keyType = arg1;\r
-       uint64_t ui64Key = 0;\r
-       byte_t blockdata[16];\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
-       struct Crypto1State mpcs = {0, 0};\r
-       struct Crypto1State *pcs;\r
-       pcs = &mpcs;\r
-\r
-       // clear trace\r
-       iso14a_clear_trace();\r
-//  iso14a_set_tracing(false);\r
-\r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\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 (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
-                       break;\r
-               };\r
-\r
-               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
-                       break;\r
-               };\r
-               \r
-               if(mifare_classic_writeblock(pcs, cuid, blockNo, blockdata)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");\r
-                       break;\r
-               };\r
-\r
-               if(mifare_classic_halt(pcs, cuid)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                       break;\r
-               };\r
-               \r
-               isOK = 1;\r
-               break;\r
-       }\r
-       \r
-       //  ----------------------------- crypto1 destroy\r
-       crypto1_destroy(pcs);\r
-       \r
-       if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
-\r
-       // add trace trailer\r
-       memset(uid, 0x44, 4);\r
-       LogTrace(uid, 4, 0, 0, TRUE);\r
-\r
-//     UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};\r
-       \r
-       LED_B_ON();\r
-       cmd_send(CMD_ACK,isOK,0,0,0,0);\r
-//     UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));\r
-       LED_B_OFF();\r
-\r
-\r
-       // Thats it...\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-       LEDsoff();\r
-//  iso14a_set_tracing(TRUE);\r
-\r
-}\r
-\r
-void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)\r
-{\r
-        // params\r
-        uint8_t blockNo = arg0;\r
-        byte_t blockdata[16];\r
-\r
-        memset(blockdata,'\0',16);\r
-        memcpy(blockdata, datain,16);\r
-        \r
-        // variables\r
-        byte_t isOK = 0;\r
-        uint8_t uid[10];\r
-        uint32_t cuid;\r
-\r
-        // clear trace\r
-        iso14a_clear_trace();\r
-       //  iso14a_set_tracing(false);\r
-\r
-               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\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 (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
-                        break;\r
-                };\r
-\r
-                if(mifare_ultra_writeblock(cuid, blockNo, blockdata)) {\r
-                        if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");\r
-                        break;\r
-                };\r
-\r
-                if(mifare_ultra_halt(cuid)) {\r
-                        if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                        break;\r
-                };\r
-                \r
-                isOK = 1;\r
-                break;\r
-        }\r
-        \r
-        if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
-\r
-        // add trace trailer\r
-        memset(uid, 0x44, 4);\r
-        LogTrace(uid, 4, 0, 0, TRUE);\r
-\r
-        LED_B_ON();\r
-       cmd_send(CMD_ACK,isOK,0,0,0,0);\r
-//      UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));\r
-        LED_B_OFF();\r
-\r
-\r
-        // Thats it...\r
-        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-        LEDsoff();\r
-//  iso14a_set_tracing(TRUE);\r
-\r
-}\r
-\r
-void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)\r
-{\r
-        // params\r
-        uint8_t blockNo = arg0;\r
-        byte_t blockdata[4];\r
-        \r
-       memcpy(blockdata, datain,4);\r
-\r
-        // variables\r
-        byte_t isOK = 0;\r
-        uint8_t uid[10];\r
-        uint32_t cuid;\r
-\r
-        // clear trace\r
-        iso14a_clear_trace();\r
-        //  iso14a_set_tracing(false);\r
-\r
-               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\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 (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
-                        break;\r
-                };\r
-\r
-                if(mifare_ultra_special_writeblock(cuid, blockNo, blockdata)) {\r
-                        if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");\r
-                        break;\r
-                };\r
-\r
-                if(mifare_ultra_halt(cuid)) {\r
-                        if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                        break;\r
-                };\r
-\r
-                isOK = 1;\r
-                break;\r
-        }\r
-\r
-        if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
-\r
-        // add trace trailer\r
-       memset(uid, 0x44, 4);\r
-        LogTrace(uid, 4, 0, 0, TRUE);\r
-\r
-       LED_B_ON();\r
-        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
-//      UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));\r
-        LED_B_OFF();\r
-\r
-\r
-        // Thats it...\r
-        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-        LEDsoff();\r
-//  iso14a_set_tracing(TRUE);\r
-\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, byte_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
-}\r
-\r
-\r
-\r
-//-----------------------------------------------------------------------------\r
-// MIFARE nested authentication. \r
-// \r
-//-----------------------------------------------------------------------------\r
-void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain)\r
-{\r
-       // params\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
-       uint64_t ui64Key = 0;\r
-\r
-       ui64Key = bytes_to_num(datain, 6);\r
-       \r
-       // variables\r
-       uint16_t rtr, i, j, len;\r
-       uint16_t davg;\r
-       static uint16_t dmin, dmax;\r
-       uint8_t uid[10];\r
-       uint32_t cuid, nt1, nt2, nttmp, nttest, par, ks1;\r
-       uint32_t target_nt[2], target_ks[2];\r
-       \r
-       uint8_t par_array[4];\r
-       uint16_t ncount = 0;\r
-       struct Crypto1State mpcs = {0, 0};\r
-       struct Crypto1State *pcs;\r
-       pcs = &mpcs;\r
-       uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
-\r
-       uint32_t auth1_time, auth2_time;\r
-       static uint16_t delta_time;\r
-\r
-       // clear trace\r
-       iso14a_clear_trace();\r
-       iso14a_set_tracing(false);\r
-       \r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-\r
-       LED_A_ON();\r
-       LED_C_OFF();\r
-\r
-\r
-       // statistics on nonce distance\r
-       if (calibrate) {        // for first call only. Otherwise reuse previous calibration\r
-               LED_B_ON();\r
-\r
-               davg = dmax = 0;\r
-               dmin = 2000;\r
-               delta_time = 0;\r
-               \r
-               for (rtr = 0; rtr < 17; rtr++) {\r
-\r
-                       // prepare next select. No need to power down the card.\r
-                       if(mifare_classic_halt(pcs, cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Halt error");\r
-                               rtr--;\r
-                               continue;\r
-                       }\r
-\r
-                       if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Can't select card");\r
-                               rtr--;\r
-                               continue;\r
-                       };\r
-\r
-                       auth1_time = 0;\r
-                       if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth1 error");\r
-                               rtr--;\r
-                               continue;\r
-                       };\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
-                               continue;\r
-                       };\r
-\r
-                       nttmp = prng_successor(nt1, 100);                               //NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160\r
-                       for (i = 101; i < 1200; i++) {\r
-                               nttmp = prng_successor(nttmp, 1);\r
-                               if (nttmp == nt2) break;\r
-                       }\r
-\r
-                       if (i != 1200) {\r
-                               if (rtr != 0) {\r
-                                       davg += i;\r
-                                       dmin = MIN(dmin, i);\r
-                                       dmax = MAX(dmax, i);\r
-                               }\r
-                               else {\r
-                                       delta_time = auth2_time - auth1_time + 32;  // allow some slack for proper timing\r
-                               }\r
-                               if (MF_DBGLEVEL >= 3) Dbprintf("Nested: calibrating... ntdist=%d", i);\r
-                       }\r
-               }\r
-               \r
-               if (rtr <= 1)   return;\r
-\r
-               davg = (davg + (rtr - 1)/2) / (rtr - 1);\r
-               \r
-               if (MF_DBGLEVEL >= 3) Dbprintf("min=%d max=%d avg=%d, delta_time=%d", dmin, dmax, davg, delta_time);\r
-\r
-               dmin = davg - 2;\r
-               dmax = davg + 2;\r
-               \r
-               LED_B_OFF();\r
-       \r
-       }\r
-//  -------------------------------------------------------------------------------------------------  \r
-       \r
-       LED_C_ON();\r
-\r
-       //  get crypted nonces for target sector\r
-       for(i=0; i < 2; i++) { // look for exactly two different nonces\r
-\r
-               target_nt[i] = 0;\r
-               while(target_nt[i] == 0) { // continue until we have an unambiguous nonce\r
-               \r
-                       // prepare next select. No need to power down the card.\r
-                       if(mifare_classic_halt(pcs, cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Halt error");\r
-                               continue;\r
-                       }\r
-\r
-                       if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Can't select card");\r
-                               continue;\r
-                       };\r
-               \r
-                       auth1_time = 0;\r
-                       if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth1 error");\r
-                               continue;\r
-                       };\r
-\r
-                       // nested authentication\r
-                       auth2_time = auth1_time + delta_time;\r
-                       len = mifare_sendcmd_shortex(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
-                               continue;\r
-                       };\r
-               \r
-                       nt2 = bytes_to_num(receivedAnswer, 4);          \r
-                       if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2, par);\r
-                       \r
-                       // Parity validity check\r
-                       for (j = 0; j < 4; j++) {\r
-                               par_array[j] = (oddparity(receivedAnswer[j]) != ((par & 0x08) >> 3));\r
-                               par = par << 1;\r
-                       }\r
-                       \r
-                       ncount = 0;\r
-                       nttest = prng_successor(nt1, dmin - 1);\r
-                       for (j = dmin; j < dmax + 1; j++) {\r
-                               nttest = prng_successor(nttest, 1);\r
-                               ks1 = nt2 ^ nttest;\r
-\r
-                               if (valid_nonce(nttest, nt2, ks1, par_array)){\r
-                                       if (ncount > 0) {               // we are only interested in disambiguous nonces, try again\r
-                                               if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (ambigous), ntdist=%d", i+1, j);\r
-                                               target_nt[i] = 0;\r
-                                               break;\r
-                                       }\r
-                                       target_nt[i] = nttest;\r
-                                       target_ks[i] = ks1;\r
-                                       ncount++;\r
-                                       if (i == 1 && target_nt[1] == target_nt[0]) { // we need two different nonces\r
-                                               target_nt[i] = 0;\r
-                                               if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#2: dismissed (= nonce#1), ntdist=%d", j);\r
-                                               break;\r
-                                       }\r
-                                       if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: valid, ntdist=%d", i+1, j);\r
-                               }\r
-                       }\r
-                       if (target_nt[i] == 0 && j == dmax+1 && MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (all invalid)", i+1);\r
-               }\r
-       }\r
-\r
-       LED_C_OFF();\r
-       \r
-       //  ----------------------------- crypto1 destroy\r
-       crypto1_destroy(pcs);\r
-       \r
-       // add trace trailer\r
-       memset(uid, 0x44, 4);\r
-       LogTrace(uid, 4, 0, 0, TRUE);\r
-\r
-       byte_t buf[4 + 4 * 4];\r
-       memcpy(buf, &cuid, 4);\r
-       memcpy(buf+4, &target_nt[0], 4);\r
-       memcpy(buf+8, &target_ks[0], 4);\r
-       memcpy(buf+12, &target_nt[1], 4);\r
-       memcpy(buf+16, &target_ks[1], 4);\r
-       \r
-       LED_B_ON();\r
-       cmd_send(CMD_ACK, 0, 2, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));\r
-       LED_B_OFF();\r
-\r
-       if (MF_DBGLEVEL >= 3)   DbpString("NESTED FINISHED");\r
-\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-       LEDsoff();\r
-       iso14a_set_tracing(TRUE);\r
-}\r
-\r
-//-----------------------------------------------------------------------------\r
-// MIFARE check keys. key count up to 85. \r
-// \r
-//-----------------------------------------------------------------------------\r
-void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r
-{\r
-  // params\r
-       uint8_t blockNo = arg0;\r
-       uint8_t keyType = arg1;\r
-       uint8_t keyCount = arg2;\r
-       uint64_t ui64Key = 0;\r
-       \r
-       // variables\r
-       int i;\r
-       byte_t isOK = 0;\r
-       uint8_t uid[10];\r
-       uint32_t cuid;\r
-       struct Crypto1State mpcs = {0, 0};\r
-       struct Crypto1State *pcs;\r
-       pcs = &mpcs;\r
-       \r
-       // clear debug level\r
-       int OLD_MF_DBGLEVEL = MF_DBGLEVEL;      \r
-       MF_DBGLEVEL = MF_DBG_NONE;\r
-       \r
-       // clear trace\r
-       iso14a_clear_trace();\r
-       iso14a_set_tracing(TRUE);\r
-\r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-\r
-       LED_A_ON();\r
-       LED_B_OFF();\r
-       LED_C_OFF();\r
-\r
-//     SpinDelay(300);\r
-       for (i = 0; i < keyCount; i++) {\r
-//             FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-//             SpinDelay(100);\r
-//             FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);\r
-               // prepare next select by sending a HALT. There is no need to power down the card.\r
-               if(mifare_classic_halt(pcs, cuid)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("ChkKeys: Halt error");\r
-               }\r
-\r
-               // SpinDelay(50);\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
-\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
-               isOK = 1;\r
-               break;\r
-       }\r
-       \r
-       //  ----------------------------- crypto1 destroy\r
-       crypto1_destroy(pcs);\r
-       \r
-       // add trace trailer\r
-       memset(uid, 0x44, 4);\r
-       LogTrace(uid, 4, 0, 0, TRUE);\r
-\r
-       LED_B_ON();\r
-    cmd_send(CMD_ACK,isOK,0,0,datain + i * 6,6);\r
-       LED_B_OFF();\r
-\r
-  // Thats it...\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-       LEDsoff();\r
-\r
-       // restore debug level\r
-       MF_DBGLEVEL = OLD_MF_DBGLEVEL;  \r
-}\r
-\r
-//-----------------------------------------------------------------------------\r
-// MIFARE commands set debug level\r
-// \r
-//-----------------------------------------------------------------------------\r
-void MifareSetDbgLvl(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
-       MF_DBGLEVEL = arg0;\r
-       Dbprintf("Debug level: %d", MF_DBGLEVEL);\r
-}\r
-\r
-//-----------------------------------------------------------------------------\r
-// Work with emulator memory\r
-// \r
-//-----------------------------------------------------------------------------\r
-void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
-       emlClearMem();\r
-}\r
-\r
-void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
-       emlSetMem(datain, arg0, arg1); // data, block num, blocks count\r
-}\r
-\r
-void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
-//     UsbCommand ack = {CMD_ACK, {arg0, arg1, 0}};\r
-\r
-  byte_t buf[48];\r
-       emlGetMem(buf, arg0, arg1); // data, block num, blocks count\r
-\r
-       LED_B_ON();\r
-  cmd_send(CMD_ACK,arg0,arg1,0,buf,48);\r
-//     UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));\r
-       LED_B_OFF();\r
-}\r
-\r
-//-----------------------------------------------------------------------------\r
-// Load a card into the emulator memory\r
-// \r
-//-----------------------------------------------------------------------------\r
-void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
-       int i;\r
-       uint8_t sectorNo = 0;\r
-       uint8_t keyType = arg1;\r
-       uint64_t ui64Key = 0;\r
-       uint32_t cuid;\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
-\r
-       // clear trace\r
-       iso14a_clear_trace();\r
-       iso14a_set_tracing(false);\r
-       \r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\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 (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
-                       break;\r
-               };\r
-               \r
-               for (i = 0; i < 16; i++) {\r
-                       sectorNo = i;\r
-                       ui64Key = emlGetKey(sectorNo, keyType);\r
-       \r
-                       if (!i){\r
-                               if(mifare_classic_auth(pcs, cuid, sectorNo * 4, keyType, ui64Key, AUTH_FIRST)) {\r
-                                       if (MF_DBGLEVEL >= 1)   Dbprintf("Sector[%d]. Auth error", i);\r
-                                       break;\r
-                               }\r
-                       } else {\r
-                               if(mifare_classic_auth(pcs, cuid, sectorNo * 4, keyType, ui64Key, AUTH_NESTED)) {\r
-                                       if (MF_DBGLEVEL >= 1)   Dbprintf("Sector[%d]. Auth nested error", i);\r
-                                       break;\r
-                               }\r
-                       }\r
-               \r
-                       if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 0, dataoutbuf)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 0 error");\r
-                               break;\r
-                       };\r
-                       emlSetMem(dataoutbuf, sectorNo * 4 + 0, 1);\r
-                       \r
-                       if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 1, dataoutbuf)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 1 error");\r
-                               break;\r
-                       };\r
-                       emlSetMem(dataoutbuf, sectorNo * 4 + 1, 1);\r
-\r
-                       if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 2, dataoutbuf)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 2 error");\r
-                               break;\r
-                       };\r
-                       emlSetMem(dataoutbuf, sectorNo * 4 + 2, 1);\r
-\r
-                       // get block 3 bytes 6-9\r
-                       if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 3, dataoutbuf)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 3 error");\r
-                               break;\r
-                       };\r
-                       emlGetMem(dataoutbuf2, sectorNo * 4 + 3, 1);\r
-                       memcpy(&dataoutbuf2[6], &dataoutbuf[6], 4);\r
-                       emlSetMem(dataoutbuf2,  sectorNo * 4 + 3, 1);\r
-               }\r
-\r
-               if(mifare_classic_halt(pcs, cuid)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                       break;\r
-               };\r
-               \r
-               break;\r
-       }       \r
-\r
-       //  ----------------------------- crypto1 destroy\r
-       crypto1_destroy(pcs);\r
-\r
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-       LEDsoff();\r
-       \r
-       if (MF_DBGLEVEL >= 2) DbpString("EMUL FILL SECTORS FINISHED");\r
-\r
-       // add trace trailer\r
-       memset(uid, 0x44, 4);\r
-       LogTrace(uid, 4, 0, 0, TRUE);\r
-}\r
-\r
-//-----------------------------------------------------------------------------\r
-// MIFARE 1k emulator\r
-// \r
-//-----------------------------------------------------------------------------\r
-\r
-\r
-//-----------------------------------------------------------------------------\r
-// Work with "magic Chinese" card (email him: ouyangweidaxian@live.cn)\r
-// \r
-//-----------------------------------------------------------------------------\r
-void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
-  \r
-  // params\r
-       uint8_t needWipe = arg0;\r
-       // bit 0 - need get UID\r
-       // bit 1 - need wupC\r
-       // bit 2 - need HALT after sequence\r
-       // bit 3 - need init FPGA and field before sequence\r
-       // bit 4 - need reset FPGA and LED\r
-       uint8_t workFlags = arg1;\r
-       uint8_t blockNo = arg2;\r
-       \r
-       // card commands\r
-       uint8_t wupC1[]       = { 0x40 }; \r
-       uint8_t wupC2[]       = { 0x43 }; \r
-       uint8_t wipeC[]       = { 0x41 }; \r
-       \r
-       // variables\r
-       byte_t isOK = 0;\r
-       uint8_t uid[10];\r
-       uint8_t d_block[18];\r
-       uint32_t cuid;\r
-       \r
-       memset(uid, 0x00, 10);\r
-       uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
-       \r
-       if (workFlags & 0x08) {\r
-               // clear trace\r
-               iso14a_clear_trace();\r
-               iso14a_set_tracing(TRUE);\r
-\r
-               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-\r
-               LED_A_ON();\r
-               LED_B_OFF();\r
-               LED_C_OFF();\r
-       \r
-               SpinDelay(300);\r
-               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-               SpinDelay(100);\r
-               FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);\r
-       }\r
-\r
-       while (true) {\r
-               // get UID from chip\r
-               if (workFlags & 0x01) {\r
-                       if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
-                               break;\r
-                       };\r
-\r
-                       if(mifare_classic_halt(NULL, cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                               break;\r
-                       };\r
-               };\r
-       \r
-               // reset chip\r
-               if (needWipe){\r
-      ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
-                       if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC1 error");\r
-                               break;\r
-                       };\r
-\r
-                       ReaderTransmit(wipeC, sizeof(wipeC), NULL);\r
-                       if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("wipeC error");\r
-                               break;\r
-                       };\r
-\r
-                       if(mifare_classic_halt(NULL, cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                               break;\r
-                       };\r
-               };      \r
-\r
-               // write block\r
-               if (workFlags & 0x02) {\r
-      ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
-                       if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC1 error");\r
-                               break;\r
-                       };\r
-\r
-                       ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
-                       if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC2 error");\r
-                               break;\r
-                       };\r
-               }\r
-\r
-               if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("write block send command error");\r
-                       break;\r
-               };\r
-       \r
-               memcpy(d_block, datain, 16);\r
-               AppendCrc14443a(d_block, 16);\r
-       \r
-               ReaderTransmit(d_block, sizeof(d_block), NULL);\r
-               if ((ReaderReceive(receivedAnswer) != 1) || (receivedAnswer[0] != 0x0a)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("write block send data error");\r
-                       break;\r
-               };      \r
-       \r
-               if (workFlags & 0x04) {\r
-                       if (mifare_classic_halt(NULL, cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                               break;\r
-                       };\r
-               }\r
-               \r
-               isOK = 1;\r
-               break;\r
-       }\r
-       \r
-//     UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};\r
-//     if (isOK) memcpy(ack.d.asBytes, uid, 4);\r
-       \r
-       // add trace trailer\r
-       /**\r
-       *       Removed by Martin, the uid is overwritten with 0x44, \r
-       *       which can 't be intended. \r
-       *\r
-       *       memset(uid, 0x44, 4);\r
-       *       LogTrace(uid, 4, 0, 0, TRUE);\r
-       **/\r
-       \r
-\r
-       LED_B_ON();\r
-  cmd_send(CMD_ACK,isOK,0,0,uid,4);\r
-//     UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));\r
-       LED_B_OFF();\r
-\r
-       if ((workFlags & 0x10) || (!isOK)) {\r
-               // Thats it...\r
-               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-               LEDsoff();\r
-       }\r
-}\r
-\r
-void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
-  \r
-  // params\r
-       // bit 1 - need wupC\r
-       // bit 2 - need HALT after sequence\r
-       // bit 3 - need init FPGA and field before sequence\r
-       // bit 4 - need reset FPGA and LED\r
-       uint8_t workFlags = arg0;\r
-       uint8_t blockNo = arg2;\r
-       \r
-       // card commands\r
-       uint8_t wupC1[]       = { 0x40 }; \r
-       uint8_t wupC2[]       = { 0x43 }; \r
-       \r
-       // variables\r
-       byte_t isOK = 0;\r
-       uint8_t data[18];\r
-       uint32_t cuid = 0;\r
-       \r
-       memset(data, 0x00, 18);\r
-       uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
-       \r
-       if (workFlags & 0x08) {\r
-               // clear trace\r
-               iso14a_clear_trace();\r
-               iso14a_set_tracing(TRUE);\r
-\r
-               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-\r
-               LED_A_ON();\r
-               LED_B_OFF();\r
-               LED_C_OFF();\r
-       \r
-               SpinDelay(300);\r
-               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-               SpinDelay(100);\r
-               FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);\r
-       }\r
-\r
-       while (true) {\r
-               if (workFlags & 0x02) {\r
-                       ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
-                       if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC1 error");\r
-                               break;\r
-                       };\r
-\r
-                       ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
-                       if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC2 error");\r
-                               break;\r
-                       };\r
-               }\r
-\r
-               // read block\r
-               if ((mifare_sendcmd_short(NULL, 0, 0x30, blockNo, receivedAnswer, NULL) != 18)) {\r
-                       if (MF_DBGLEVEL >= 1)   Dbprintf("read block send command error");\r
-                       break;\r
-               };\r
-               memcpy(data, receivedAnswer, 18);\r
-               \r
-               if (workFlags & 0x04) {\r
-                       if (mifare_classic_halt(NULL, cuid)) {\r
-                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
-                               break;\r
-                       };\r
-               }\r
-               \r
-               isOK = 1;\r
-               break;\r
-       }\r
-       \r
-//     UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};\r
-//     if (isOK) memcpy(ack.d.asBytes, data, 18);\r
-       \r
-       // add trace trailer\r
-       /*\r
-       * Removed by Martin, this piece of overwrites the 'data' variable \r
-       * which is sent two lines down, and is obviously not correct. \r
-       * \r
-       * memset(data, 0x44, 4);\r
-       * LogTrace(data, 4, 0, 0, TRUE);\r
-       */\r
-       LED_B_ON();\r
-  cmd_send(CMD_ACK,isOK,0,0,data,18);\r
-//     UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));\r
-       LED_B_OFF();\r
-\r
-       if ((workFlags & 0x10) || (!isOK)) {\r
-               // Thats it...\r
-               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-               LEDsoff();\r
-       }\r
-}\r
-\r
+//-----------------------------------------------------------------------------
+// Merlok - June 2011, 2012
+// Gerhard de Koning Gans - May 2008
+// Hagen Fritsch - June 2010
+// Midnitesnake - Dec 2013
+// Andy Davies  - Apr 2014
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Routines to support ISO 14443 type A.
+//-----------------------------------------------------------------------------
+
+#include "mifarecmd.h"
+#include "apps.h"
+
+//-----------------------------------------------------------------------------
+// Select, Authenticaate, Read an MIFARE tag. 
+// read block
+//-----------------------------------------------------------------------------
+void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
+{
+  // params
+       uint8_t blockNo = arg0;
+       uint8_t keyType = arg1;
+       uint64_t ui64Key = 0;
+       ui64Key = bytes_to_num(datain, 6);
+       
+       // variables
+       byte_t isOK = 0;
+       byte_t dataoutbuf[16];
+       uint8_t uid[10];
+       uint32_t cuid;
+       struct Crypto1State mpcs = {0, 0};
+       struct Crypto1State *pcs;
+       pcs = &mpcs;
+
+       // clear trace
+       iso14a_clear_trace();
+//     iso14a_set_tracing(false);
+
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+       LED_A_ON();
+       LED_B_OFF();
+       LED_C_OFF();
+
+       while (true) {
+               if(!iso14443a_select_card(uid, NULL, &cuid)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
+                       break;
+               };
+
+               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");
+                       break;
+               };
+               
+               if(mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block error");
+                       break;
+               };
+
+               if(mifare_classic_halt(pcs, cuid)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
+                       break;
+               };
+               
+               isOK = 1;
+               break;
+       }
+       
+       //  ----------------------------- crypto1 destroy
+       crypto1_destroy(pcs);
+       
+       if (MF_DBGLEVEL >= 2)   DbpString("READ BLOCK FINISHED");
+
+       // add trace trailer
+       memset(uid, 0x44, 4);
+       LogTrace(uid, 4, 0, 0, TRUE);
+       
+       LED_B_ON();
+       cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);
+       LED_B_OFF();
+
+
+       // Thats it...
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LEDsoff();
+       //iso14a_set_tracing(TRUE);
+
+}
+
+
+void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){
+       // variables
+       byte_t isOK = 0;
+       byte_t dataoutbuf[16];
+       uint8_t uid[10];
+       uint32_t cuid;
+    
+       // clear trace
+       iso14a_clear_trace();
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    
+       LED_A_ON();
+       LED_B_OFF();
+       LED_C_OFF();
+       
+
+       if(!iso14443a_select_card(uid, NULL, &cuid)) {
+          if (MF_DBGLEVEL >= 1)        Dbprintf("Can't select card, something went wrong before auth");
+       };
+
+       if(mifare_ultra_auth1(cuid, dataoutbuf)){
+         if (MF_DBGLEVEL >= 1) Dbprintf("Authentication part1: Fail.");    
+       }
+
+       isOK=1;
+       if (MF_DBGLEVEL >= 2)   DbpString("AUTH 1 FINISHED");
+    
+       LED_B_ON();
+        cmd_send(CMD_ACK,isOK,cuid,0,dataoutbuf,11);
+       LED_B_OFF();
+         
+       // Thats it...
+       //FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LEDsoff();
+}
+void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){
+       // params
+       uint32_t cuid = arg0;
+       uint8_t key[16]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+       // variables
+       byte_t isOK = 0;
+       byte_t dataoutbuf[16];
+    
+       memcpy(key, datain, 16);
+       // clear trace
+       //iso14a_clear_trace();
+       //iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    
+       LED_A_ON();
+       LED_B_OFF();
+       LED_C_OFF();
+
+//     Dbprintf("Sending %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+//              key[0],key[1],key[2],key[3],key[4],key[5],key[6],key[7],key[8],
+//              key[9],key[10],key[11],key[12],key[13],key[14],key[15]);
+       
+       if(mifare_ultra_auth2(cuid, key, dataoutbuf)){
+           if (MF_DBGLEVEL >= 1) Dbprintf("Authentication part2: Fail...");    
+       }
+       isOK=1;
+       if (MF_DBGLEVEL >= 2)   DbpString("AUTH 2 FINISHED");
+    
+       LED_B_ON();
+        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,11);
+       LED_B_OFF();
+    
+    // Thats it...
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LEDsoff();
+}
+
+void MifareUReadBlock(uint8_t arg0, uint8_t *datain )
+{
+    // params
+       uint8_t blockNo = arg0;
+       //uint8_t key[16]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+       // variables
+       byte_t isOK = 0;
+       byte_t dataoutbuf[16];
+       uint8_t uid[10];
+       uint32_t cuid;
+    
+       //memcpy(key, datain + 10, 26);
+       
+       // clear trace
+       iso14a_clear_trace();
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    
+       LED_A_ON();
+       LED_B_OFF();
+       LED_C_OFF();
+    
+       while (true) {
+         if(!iso14443a_select_card(uid, NULL, &cuid)) {
+            if (MF_DBGLEVEL >= 1)      Dbprintf("Can't select card");
+                       break;
+         };
+
+         if(mifare_ultra_readblock(cuid, blockNo, dataoutbuf)) {
+            if (MF_DBGLEVEL >= 1)      Dbprintf("Read block error");
+                       break;
+         };
+        
+         if(mifare_ultra_halt(cuid)) {
+            if (MF_DBGLEVEL >= 1)      Dbprintf("Halt error");
+                       break;
+         };    
+         isOK = 1;
+         break;
+       }
+       
+       if (MF_DBGLEVEL >= 2)   DbpString("READ BLOCK FINISHED");
+    
+       // add trace trailer
+       memset(uid, 0x44, 4);
+       LogTrace(uid, 4, 0, 0, TRUE);
+       LED_B_ON();
+        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);
+       LED_B_OFF();
+    
+    
+    // Thats it...
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LEDsoff();
+}
+
+//-----------------------------------------------------------------------------
+// Select, Authenticaate, Read an MIFARE tag. 
+// read sector (data = 4 x 16 bytes = 64 bytes)
+//-----------------------------------------------------------------------------
+void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
+{
+  // params
+       uint8_t sectorNo = arg0;
+       uint8_t keyType = arg1;
+       uint64_t ui64Key = 0;
+       ui64Key = bytes_to_num(datain, 6);
+       
+       // variables
+       byte_t isOK = 0;
+       byte_t dataoutbuf[16 * 4];
+       uint8_t uid[10];
+       uint32_t cuid;
+       struct Crypto1State mpcs = {0, 0};
+       struct Crypto1State *pcs;
+       pcs = &mpcs;
+
+       // clear trace
+       iso14a_clear_trace();
+//     iso14a_set_tracing(false);
+
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+       LED_A_ON();
+       LED_B_OFF();
+       LED_C_OFF();
+
+       while (true) {
+               if(!iso14443a_select_card(uid, NULL, &cuid)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
+                       break;
+               };
+
+               if(mifare_classic_auth(pcs, cuid, sectorNo * 4, keyType, ui64Key, AUTH_FIRST)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");
+                       break;
+               };
+               
+               if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 0, dataoutbuf + 16 * 0)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 0 error");
+                       break;
+               };
+               if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 1, dataoutbuf + 16 * 1)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 1 error");
+                       break;
+               };
+               if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 2, dataoutbuf + 16 * 2)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 2 error");
+                       break;
+               };
+               if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 3, dataoutbuf + 16 * 3)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 3 error");
+                       break;
+               };
+               
+               if(mifare_classic_halt(pcs, cuid)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
+                       break;
+               };
+
+               isOK = 1;
+               break;
+       }
+       
+       //  ----------------------------- crypto1 destroy
+       crypto1_destroy(pcs);
+       
+       if (MF_DBGLEVEL >= 2) DbpString("READ SECTOR FINISHED");
+
+       // add trace trailer
+       memset(uid, 0x44, 4);
+       LogTrace(uid, 4, 0, 0, TRUE);
+
+//     UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
+//     memcpy(ack.d.asBytes, dataoutbuf, 16 * 2);
+       
+       LED_B_ON();
+  cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,32);
+//     UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+//     SpinDelay(100);
+       
+//     memcpy(ack.d.asBytes, dataoutbuf + 16 * 2, 16 * 2);
+//     UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+  cmd_send(CMD_ACK,isOK,0,0,dataoutbuf+32, 32);
+       LED_B_OFF();
+
+       // Thats it...
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LEDsoff();
+//  iso14a_set_tracing(TRUE);
+
+}
+
+void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)
+{
+  // params
+        uint8_t sectorNo = arg0;
+        int Pages=arg1;
+       int count_Pages=0;
+        // variables
+        byte_t isOK = 0;
+        byte_t dataoutbuf[44 * 4];
+        uint8_t uid[10];
+        uint32_t cuid;
+
+        // clear trace
+        iso14a_clear_trace();
+//      iso14a_set_tracing(false);
+
+               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+        LED_A_ON();
+        LED_B_OFF();
+        LED_C_OFF();
+        Dbprintf("Pages %d",Pages);
+        while (true) {
+                if(!iso14443a_select_card(uid, NULL, &cuid)) {
+                if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
+                        break;
+                };
+               for(int sec=0;sec<Pages;sec++){
+                    if(mifare_ultra_readblock(cuid, sectorNo * 4 + sec, dataoutbuf + 4 * sec)) {
+                      if (MF_DBGLEVEL >= 1)   Dbprintf("Read block %d error",sec);
+                        break;
+                    }else{
+                     count_Pages++;
+                   };
+                }
+                if(mifare_ultra_halt(cuid)) {
+                if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
+                        break;
+                };
+
+                isOK = 1;
+                break;
+        }
+        Dbprintf("Pages read %d",count_Pages);
+        if (MF_DBGLEVEL >= 2) DbpString("READ CARD FINISHED");
+
+        // add trace trailer
+        //memset(uid, 0x44, 4);
+        //LogTrace(uid, 4, 0, 0, TRUE);
+        
+        LED_B_ON();
+       if (Pages==16) cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,64);
+       if (Pages==44 && count_Pages==16) cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,64);
+       if (Pages==44 && count_Pages>16) cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,176);
+        //cmd_send(CMD_ACK,isOK,0,0,dataoutbuf+32, 32);
+        LED_B_OFF();
+
+        // Thats it...
+        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+        LEDsoff();
+//  iso14a_set_tracing(TRUE);
+
+}
+
+
+//-----------------------------------------------------------------------------
+// Select, Authenticaate, Read an MIFARE tag. 
+// read block
+//-----------------------------------------------------------------------------
+void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
+{
+       // params
+       uint8_t blockNo = arg0;
+       uint8_t keyType = arg1;
+       uint64_t ui64Key = 0;
+       byte_t blockdata[16];
+
+       ui64Key = bytes_to_num(datain, 6);
+       memcpy(blockdata, datain + 10, 16);
+       
+       // variables
+       byte_t isOK = 0;
+       uint8_t uid[10];
+       uint32_t cuid;
+       struct Crypto1State mpcs = {0, 0};
+       struct Crypto1State *pcs;
+       pcs = &mpcs;
+
+       // clear trace
+       iso14a_clear_trace();
+//  iso14a_set_tracing(false);
+
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+       LED_A_ON();
+       LED_B_OFF();
+       LED_C_OFF();
+
+       while (true) {
+                       if(!iso14443a_select_card(uid, NULL, &cuid)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
+                       break;
+               };
+
+               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");
+                       break;
+               };
+               
+               if(mifare_classic_writeblock(pcs, cuid, blockNo, blockdata)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");
+                       break;
+               };
+
+               if(mifare_classic_halt(pcs, cuid)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
+                       break;
+               };
+               
+               isOK = 1;
+               break;
+       }
+       
+       //  ----------------------------- crypto1 destroy
+       crypto1_destroy(pcs);
+       
+       if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");
+
+       // add trace trailer
+       memset(uid, 0x44, 4);
+       LogTrace(uid, 4, 0, 0, TRUE);
+
+//     UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
+       
+       LED_B_ON();
+       cmd_send(CMD_ACK,isOK,0,0,0,0);
+//     UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+       LED_B_OFF();
+
+
+       // Thats it...
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LEDsoff();
+//  iso14a_set_tracing(TRUE);
+
+}
+
+void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
+{
+        // params
+        uint8_t blockNo = arg0;
+        byte_t blockdata[16];
+
+        memset(blockdata,'\0',16);
+        memcpy(blockdata, datain,16);
+        
+        // variables
+        byte_t isOK = 0;
+        uint8_t uid[10];
+        uint32_t cuid;
+
+        // clear trace
+        iso14a_clear_trace();
+       //  iso14a_set_tracing(false);
+
+               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+        LED_A_ON();
+        LED_B_OFF();
+        LED_C_OFF();
+
+        while (true) {
+                if(!iso14443a_select_card(uid, NULL, &cuid)) {
+                        if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
+                        break;
+                };
+
+                if(mifare_ultra_writeblock(cuid, blockNo, blockdata)) {
+                        if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");
+                        break;
+                };
+
+                if(mifare_ultra_halt(cuid)) {
+                        if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
+                        break;
+                };
+                
+                isOK = 1;
+                break;
+        }
+        
+        if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");
+
+        // add trace trailer
+        memset(uid, 0x44, 4);
+        LogTrace(uid, 4, 0, 0, TRUE);
+
+        LED_B_ON();
+       cmd_send(CMD_ACK,isOK,0,0,0,0);
+//      UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+        LED_B_OFF();
+
+
+        // Thats it...
+        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+        LEDsoff();
+//  iso14a_set_tracing(TRUE);
+
+}
+
+void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)
+{
+        // params
+        uint8_t blockNo = arg0;
+        byte_t blockdata[4];
+        
+       memcpy(blockdata, datain,4);
+
+        // variables
+        byte_t isOK = 0;
+        uint8_t uid[10];
+        uint32_t cuid;
+
+        // clear trace
+        iso14a_clear_trace();
+        //  iso14a_set_tracing(false);
+
+               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+        LED_A_ON();
+        LED_B_OFF();
+        LED_C_OFF();
+
+        while (true) {
+                        if(!iso14443a_select_card(uid, NULL, &cuid)) {
+                        if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
+                        break;
+                };
+
+                if(mifare_ultra_special_writeblock(cuid, blockNo, blockdata)) {
+                        if (MF_DBGLEVEL >= 1)   Dbprintf("Write block error");
+                        break;
+                };
+
+                if(mifare_ultra_halt(cuid)) {
+                        if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
+                        break;
+                };
+
+                isOK = 1;
+                break;
+        }
+
+        if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");
+
+        // add trace trailer
+       memset(uid, 0x44, 4);
+        LogTrace(uid, 4, 0, 0, TRUE);
+
+       LED_B_ON();
+        cmd_send(CMD_ACK,isOK,0,0,0,0);
+//      UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+        LED_B_OFF();
+
+
+        // Thats it...
+        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+        LEDsoff();
+//  iso14a_set_tracing(TRUE);
+
+}
+
+// Return 1 if the nonce is invalid else return 0
+int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, byte_t * parity) {
+       return ((oddparity((Nt >> 24) & 0xFF) == ((parity[0]) ^ oddparity((NtEnc >> 24) & 0xFF) ^ BIT(Ks1,16))) & \
+       (oddparity((Nt >> 16) & 0xFF) == ((parity[1]) ^ oddparity((NtEnc >> 16) & 0xFF) ^ BIT(Ks1,8))) & \
+       (oddparity((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity((NtEnc >> 8) & 0xFF) ^ BIT(Ks1,0)))) ? 1 : 0;
+}
+
+
+
+//-----------------------------------------------------------------------------
+// MIFARE nested authentication. 
+// 
+//-----------------------------------------------------------------------------
+void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain)
+{
+       // params
+       uint8_t blockNo = arg0 & 0xff;
+       uint8_t keyType = (arg0 >> 8) & 0xff;
+       uint8_t targetBlockNo = arg1 & 0xff;
+       uint8_t targetKeyType = (arg1 >> 8) & 0xff;
+       uint64_t ui64Key = 0;
+
+       ui64Key = bytes_to_num(datain, 6);
+       
+       // variables
+       uint16_t rtr, i, j, len;
+       uint16_t davg;
+       static uint16_t dmin, dmax;
+       uint8_t uid[10];
+       uint32_t cuid, nt1, nt2, nttmp, nttest, par, ks1;
+       uint32_t target_nt[2], target_ks[2];
+       
+       uint8_t par_array[4];
+       uint16_t ncount = 0;
+       struct Crypto1State mpcs = {0, 0};
+       struct Crypto1State *pcs;
+       pcs = &mpcs;
+       uint8_t* receivedAnswer = mifare_get_bigbufptr();
+
+       uint32_t auth1_time, auth2_time;
+       static uint16_t delta_time;
+
+       // clear trace
+       iso14a_clear_trace();
+       iso14a_set_tracing(false);
+       
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+       LED_A_ON();
+       LED_C_OFF();
+
+
+       // statistics on nonce distance
+       if (calibrate) {        // for first call only. Otherwise reuse previous calibration
+               LED_B_ON();
+
+               davg = dmax = 0;
+               dmin = 2000;
+               delta_time = 0;
+               
+               for (rtr = 0; rtr < 17; rtr++) {
+
+                       // prepare next select. No need to power down the card.
+                       if(mifare_classic_halt(pcs, cuid)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Halt error");
+                               rtr--;
+                               continue;
+                       }
+
+                       if(!iso14443a_select_card(uid, NULL, &cuid)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Can't select card");
+                               rtr--;
+                               continue;
+                       };
+
+                       auth1_time = 0;
+                       if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth1 error");
+                               rtr--;
+                               continue;
+                       };
+
+                       if (delta_time) {
+                               auth2_time = auth1_time + delta_time;
+                       } else {
+                               auth2_time = 0;
+                       }
+                       if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2, &auth2_time)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth2 error");
+                               rtr--;
+                               continue;
+                       };
+
+                       nttmp = prng_successor(nt1, 100);                               //NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160
+                       for (i = 101; i < 1200; i++) {
+                               nttmp = prng_successor(nttmp, 1);
+                               if (nttmp == nt2) break;
+                       }
+
+                       if (i != 1200) {
+                               if (rtr != 0) {
+                                       davg += i;
+                                       dmin = MIN(dmin, i);
+                                       dmax = MAX(dmax, i);
+                               }
+                               else {
+                                       delta_time = auth2_time - auth1_time + 32;  // allow some slack for proper timing
+                               }
+                               if (MF_DBGLEVEL >= 3) Dbprintf("Nested: calibrating... ntdist=%d", i);
+                       }
+               }
+               
+               if (rtr <= 1)   return;
+
+               davg = (davg + (rtr - 1)/2) / (rtr - 1);
+               
+               if (MF_DBGLEVEL >= 3) Dbprintf("min=%d max=%d avg=%d, delta_time=%d", dmin, dmax, davg, delta_time);
+
+               dmin = davg - 2;
+               dmax = davg + 2;
+               
+               LED_B_OFF();
+       
+       }
+//  -------------------------------------------------------------------------------------------------  
+       
+       LED_C_ON();
+
+       //  get crypted nonces for target sector
+       for(i=0; i < 2; i++) { // look for exactly two different nonces
+
+               target_nt[i] = 0;
+               while(target_nt[i] == 0) { // continue until we have an unambiguous nonce
+               
+                       // prepare next select. No need to power down the card.
+                       if(mifare_classic_halt(pcs, cuid)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Halt error");
+                               continue;
+                       }
+
+                       if(!iso14443a_select_card(uid, NULL, &cuid)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Can't select card");
+                               continue;
+                       };
+               
+                       auth1_time = 0;
+                       if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth1 error");
+                               continue;
+                       };
+
+                       // nested authentication
+                       auth2_time = auth1_time + delta_time;
+                       len = mifare_sendcmd_shortex(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, &par, &auth2_time);
+                       if (len != 4) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Nested: Auth2 error len=%d", len);
+                               continue;
+                       };
+               
+                       nt2 = bytes_to_num(receivedAnswer, 4);          
+                       if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2, par);
+                       
+                       // Parity validity check
+                       for (j = 0; j < 4; j++) {
+                               par_array[j] = (oddparity(receivedAnswer[j]) != ((par & 0x08) >> 3));
+                               par = par << 1;
+                       }
+                       
+                       ncount = 0;
+                       nttest = prng_successor(nt1, dmin - 1);
+                       for (j = dmin; j < dmax + 1; j++) {
+                               nttest = prng_successor(nttest, 1);
+                               ks1 = nt2 ^ nttest;
+
+                               if (valid_nonce(nttest, nt2, ks1, par_array)){
+                                       if (ncount > 0) {               // we are only interested in disambiguous nonces, try again
+                                               if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (ambigous), ntdist=%d", i+1, j);
+                                               target_nt[i] = 0;
+                                               break;
+                                       }
+                                       target_nt[i] = nttest;
+                                       target_ks[i] = ks1;
+                                       ncount++;
+                                       if (i == 1 && target_nt[1] == target_nt[0]) { // we need two different nonces
+                                               target_nt[i] = 0;
+                                               if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#2: dismissed (= nonce#1), ntdist=%d", j);
+                                               break;
+                                       }
+                                       if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: valid, ntdist=%d", i+1, j);
+                               }
+                       }
+                       if (target_nt[i] == 0 && j == dmax+1 && MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (all invalid)", i+1);
+               }
+       }
+
+       LED_C_OFF();
+       
+       //  ----------------------------- crypto1 destroy
+       crypto1_destroy(pcs);
+       
+       // add trace trailer
+       memset(uid, 0x44, 4);
+       LogTrace(uid, 4, 0, 0, TRUE);
+
+       byte_t buf[4 + 4 * 4];
+       memcpy(buf, &cuid, 4);
+       memcpy(buf+4, &target_nt[0], 4);
+       memcpy(buf+8, &target_ks[0], 4);
+       memcpy(buf+12, &target_nt[1], 4);
+       memcpy(buf+16, &target_ks[1], 4);
+       
+       LED_B_ON();
+       cmd_send(CMD_ACK, 0, 2, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));
+       LED_B_OFF();
+
+       if (MF_DBGLEVEL >= 3)   DbpString("NESTED FINISHED");
+
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LEDsoff();
+       iso14a_set_tracing(TRUE);
+}
+
+//-----------------------------------------------------------------------------
+// MIFARE check keys. key count up to 85. 
+// 
+//-----------------------------------------------------------------------------
+void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
+{
+  // params
+       uint8_t blockNo = arg0;
+       uint8_t keyType = arg1;
+       uint8_t keyCount = arg2;
+       uint64_t ui64Key = 0;
+       
+       // variables
+       int i;
+       byte_t isOK = 0;
+       uint8_t uid[10];
+       uint32_t cuid;
+       struct Crypto1State mpcs = {0, 0};
+       struct Crypto1State *pcs;
+       pcs = &mpcs;
+       
+       // clear debug level
+       int OLD_MF_DBGLEVEL = MF_DBGLEVEL;      
+       MF_DBGLEVEL = MF_DBG_NONE;
+       
+       // clear trace
+       iso14a_clear_trace();
+       iso14a_set_tracing(TRUE);
+
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+       LED_A_ON();
+       LED_B_OFF();
+       LED_C_OFF();
+
+//     SpinDelay(300);
+       for (i = 0; i < keyCount; i++) {
+//             FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+//             SpinDelay(100);
+//             FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
+               // prepare next select by sending a HALT. There is no need to power down the card.
+               if(mifare_classic_halt(pcs, cuid)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("ChkKeys: Halt error");
+               }
+
+               // SpinDelay(50);
+               
+               if(!iso14443a_select_card(uid, NULL, &cuid)) {
+                       if (OLD_MF_DBGLEVEL >= 1)       Dbprintf("ChkKeys: Can't select card");
+                       break;
+               };
+
+               ui64Key = bytes_to_num(datain + i * 6, 6);
+               if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
+                       continue;
+               };
+               
+               isOK = 1;
+               break;
+       }
+       
+       //  ----------------------------- crypto1 destroy
+       crypto1_destroy(pcs);
+       
+       // add trace trailer
+       memset(uid, 0x44, 4);
+       LogTrace(uid, 4, 0, 0, TRUE);
+
+       LED_B_ON();
+    cmd_send(CMD_ACK,isOK,0,0,datain + i * 6,6);
+       LED_B_OFF();
+
+  // Thats it...
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LEDsoff();
+
+       // restore debug level
+       MF_DBGLEVEL = OLD_MF_DBGLEVEL;  
+}
+
+//-----------------------------------------------------------------------------
+// MIFARE commands set debug level
+// 
+//-----------------------------------------------------------------------------
+void MifareSetDbgLvl(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+       MF_DBGLEVEL = arg0;
+       Dbprintf("Debug level: %d", MF_DBGLEVEL);
+}
+
+//-----------------------------------------------------------------------------
+// Work with emulator memory
+// 
+//-----------------------------------------------------------------------------
+void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+       emlClearMem();
+}
+
+void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+       emlSetMem(datain, arg0, arg1); // data, block num, blocks count
+}
+
+void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+//     UsbCommand ack = {CMD_ACK, {arg0, arg1, 0}};
+
+  byte_t buf[48];
+       emlGetMem(buf, arg0, arg1); // data, block num, blocks count
+
+       LED_B_ON();
+  cmd_send(CMD_ACK,arg0,arg1,0,buf,48);
+//     UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+       LED_B_OFF();
+}
+
+//-----------------------------------------------------------------------------
+// Load a card into the emulator memory
+// 
+//-----------------------------------------------------------------------------
+void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+       int i;
+       uint8_t sectorNo = 0;
+       uint8_t keyType = arg1;
+       uint64_t ui64Key = 0;
+       uint32_t cuid;
+       struct Crypto1State mpcs = {0, 0};
+       struct Crypto1State *pcs;
+       pcs = &mpcs;
+
+       // variables
+       byte_t dataoutbuf[16];
+       byte_t dataoutbuf2[16];
+       uint8_t uid[10];
+
+       // clear trace
+       iso14a_clear_trace();
+       iso14a_set_tracing(false);
+       
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+       LED_A_ON();
+       LED_B_OFF();
+       LED_C_OFF();
+       
+       while (true) {
+               if(!iso14443a_select_card(uid, NULL, &cuid)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
+                       break;
+               };
+               
+               for (i = 0; i < 16; i++) {
+                       sectorNo = i;
+                       ui64Key = emlGetKey(sectorNo, keyType);
+       
+                       if (!i){
+                               if(mifare_classic_auth(pcs, cuid, sectorNo * 4, keyType, ui64Key, AUTH_FIRST)) {
+                                       if (MF_DBGLEVEL >= 1)   Dbprintf("Sector[%d]. Auth error", i);
+                                       break;
+                               }
+                       } else {
+                               if(mifare_classic_auth(pcs, cuid, sectorNo * 4, keyType, ui64Key, AUTH_NESTED)) {
+                                       if (MF_DBGLEVEL >= 1)   Dbprintf("Sector[%d]. Auth nested error", i);
+                                       break;
+                               }
+                       }
+               
+                       if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 0, dataoutbuf)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 0 error");
+                               break;
+                       };
+                       emlSetMem(dataoutbuf, sectorNo * 4 + 0, 1);
+                       
+                       if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 1, dataoutbuf)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 1 error");
+                               break;
+                       };
+                       emlSetMem(dataoutbuf, sectorNo * 4 + 1, 1);
+
+                       if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 2, dataoutbuf)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 2 error");
+                               break;
+                       };
+                       emlSetMem(dataoutbuf, sectorNo * 4 + 2, 1);
+
+                       // get block 3 bytes 6-9
+                       if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 3, dataoutbuf)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Read block 3 error");
+                               break;
+                       };
+                       emlGetMem(dataoutbuf2, sectorNo * 4 + 3, 1);
+                       memcpy(&dataoutbuf2[6], &dataoutbuf[6], 4);
+                       emlSetMem(dataoutbuf2,  sectorNo * 4 + 3, 1);
+               }
+
+               if(mifare_classic_halt(pcs, cuid)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
+                       break;
+               };
+               
+               break;
+       }       
+
+       //  ----------------------------- crypto1 destroy
+       crypto1_destroy(pcs);
+
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LEDsoff();
+       
+       if (MF_DBGLEVEL >= 2) DbpString("EMUL FILL SECTORS FINISHED");
+
+       // add trace trailer
+       memset(uid, 0x44, 4);
+       LogTrace(uid, 4, 0, 0, TRUE);
+}
+
+//-----------------------------------------------------------------------------
+// MIFARE 1k emulator
+// 
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// Work with "magic Chinese" card (email him: ouyangweidaxian@live.cn)
+// 
+//-----------------------------------------------------------------------------
+void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+  
+  // params
+       uint8_t needWipe = arg0;
+       // bit 0 - need get UID
+       // bit 1 - need wupC
+       // bit 2 - need HALT after sequence
+       // bit 3 - need init FPGA and field before sequence
+       // bit 4 - need reset FPGA and LED
+       uint8_t workFlags = arg1;
+       uint8_t blockNo = arg2;
+       
+       // card commands
+       uint8_t wupC1[]       = { 0x40 }; 
+       uint8_t wupC2[]       = { 0x43 }; 
+       uint8_t wipeC[]       = { 0x41 }; 
+       
+       // variables
+       byte_t isOK = 0;
+       uint8_t uid[10];
+       uint8_t d_block[18];
+       uint32_t cuid;
+       
+       memset(uid, 0x00, 10);
+       uint8_t* receivedAnswer = mifare_get_bigbufptr();
+       
+       if (workFlags & 0x08) {
+               // clear trace
+               iso14a_clear_trace();
+               iso14a_set_tracing(TRUE);
+
+               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+               LED_A_ON();
+               LED_B_OFF();
+               LED_C_OFF();
+       
+               SpinDelay(300);
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+               SpinDelay(100);
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
+       }
+
+       while (true) {
+               // get UID from chip
+               if (workFlags & 0x01) {
+                       if(!iso14443a_select_card(uid, NULL, &cuid)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
+                               break;
+                       };
+
+                       if(mifare_classic_halt(NULL, cuid)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
+                               break;
+                       };
+               };
+       
+               // reset chip
+               if (needWipe){
+      ReaderTransmitBitsPar(wupC1,7,0, NULL);
+                       if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC1 error");
+                               break;
+                       };
+
+                       ReaderTransmit(wipeC, sizeof(wipeC), NULL);
+                       if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("wipeC error");
+                               break;
+                       };
+
+                       if(mifare_classic_halt(NULL, cuid)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
+                               break;
+                       };
+               };      
+
+               // write block
+               if (workFlags & 0x02) {
+      ReaderTransmitBitsPar(wupC1,7,0, NULL);
+                       if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC1 error");
+                               break;
+                       };
+
+                       ReaderTransmit(wupC2, sizeof(wupC2), NULL);
+                       if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC2 error");
+                               break;
+                       };
+               }
+
+               if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("write block send command error");
+                       break;
+               };
+       
+               memcpy(d_block, datain, 16);
+               AppendCrc14443a(d_block, 16);
+       
+               ReaderTransmit(d_block, sizeof(d_block), NULL);
+               if ((ReaderReceive(receivedAnswer) != 1) || (receivedAnswer[0] != 0x0a)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("write block send data error");
+                       break;
+               };      
+       
+               if (workFlags & 0x04) {
+                       if (mifare_classic_halt(NULL, cuid)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
+                               break;
+                       };
+               }
+               
+               isOK = 1;
+               break;
+       }
+       
+//     UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
+//     if (isOK) memcpy(ack.d.asBytes, uid, 4);
+       
+       // add trace trailer
+       /**
+       *       Removed by Martin, the uid is overwritten with 0x44, 
+       *       which can 't be intended. 
+       *
+       *       memset(uid, 0x44, 4);
+       *       LogTrace(uid, 4, 0, 0, TRUE);
+       **/
+       
+
+       LED_B_ON();
+  cmd_send(CMD_ACK,isOK,0,0,uid,4);
+//     UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+       LED_B_OFF();
+
+       if ((workFlags & 0x10) || (!isOK)) {
+               // Thats it...
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+               LEDsoff();
+       }
+}
+
+void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+  
+  // params
+       // bit 1 - need wupC
+       // bit 2 - need HALT after sequence
+       // bit 3 - need init FPGA and field before sequence
+       // bit 4 - need reset FPGA and LED
+       uint8_t workFlags = arg0;
+       uint8_t blockNo = arg2;
+       
+       // card commands
+       uint8_t wupC1[]       = { 0x40 }; 
+       uint8_t wupC2[]       = { 0x43 }; 
+       
+       // variables
+       byte_t isOK = 0;
+       uint8_t data[18];
+       uint32_t cuid = 0;
+       
+       memset(data, 0x00, 18);
+       uint8_t* receivedAnswer = mifare_get_bigbufptr();
+       
+       if (workFlags & 0x08) {
+               // clear trace
+               iso14a_clear_trace();
+               iso14a_set_tracing(TRUE);
+
+               iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+               LED_A_ON();
+               LED_B_OFF();
+               LED_C_OFF();
+       
+               SpinDelay(300);
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+               SpinDelay(100);
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
+       }
+
+       while (true) {
+               if (workFlags & 0x02) {
+                       ReaderTransmitBitsPar(wupC1,7,0, NULL);
+                       if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC1 error");
+                               break;
+                       };
+
+                       ReaderTransmit(wupC2, sizeof(wupC2), NULL);
+                       if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("wupC2 error");
+                               break;
+                       };
+               }
+
+               // read block
+               if ((mifare_sendcmd_short(NULL, 0, 0x30, blockNo, receivedAnswer, NULL) != 18)) {
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("read block send command error");
+                       break;
+               };
+               memcpy(data, receivedAnswer, 18);
+               
+               if (workFlags & 0x04) {
+                       if (mifare_classic_halt(NULL, cuid)) {
+                               if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");
+                               break;
+                       };
+               }
+               
+               isOK = 1;
+               break;
+       }
+       
+//     UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
+//     if (isOK) memcpy(ack.d.asBytes, data, 18);
+       
+       // add trace trailer
+       /*
+       * Removed by Martin, this piece of overwrites the 'data' variable 
+       * which is sent two lines down, and is obviously not correct. 
+       * 
+       * memset(data, 0x44, 4);
+       * LogTrace(data, 4, 0, 0, TRUE);
+       */
+       LED_B_ON();
+  cmd_send(CMD_ACK,isOK,0,0,data,18);
+//     UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+       LED_B_OFF();
+
+       if ((workFlags & 0x10) || (!isOK)) {
+               // Thats it...
+               FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+               LEDsoff();
+       }
+}
+
+//
+// DESFIRE
+//
+
+void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
+       // variables
+       byte_t isOK = 0;
+       byte_t dataoutbuf[16];
+       uint8_t uid[10];
+       uint32_t cuid;
+    
+       // clear trace
+       iso14a_clear_trace();
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    
+       LED_A_ON();
+       LED_B_OFF();
+       LED_C_OFF();
+       
+
+       if(!iso14443a_select_card(uid, NULL, &cuid)) {
+          if (MF_DBGLEVEL >= 1)        Dbprintf("Can't select card, something went wrong before auth");
+       };
+
+       if(mifare_desfire_des_auth1(cuid, dataoutbuf)){
+         if (MF_DBGLEVEL >= 1) Dbprintf("Authentication part1: Fail.");    
+       }
+
+       isOK=1;
+       if (MF_DBGLEVEL >= 2)   DbpString("AUTH 1 FINISHED");
+    
+       LED_B_ON();
+        cmd_send(CMD_ACK,isOK,cuid,0,dataoutbuf,11);
+       LED_B_OFF();
+         
+       // Thats it...
+       //FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LEDsoff();
+}
+
+void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
+       // params
+       uint32_t cuid = arg0;
+       uint8_t key[16]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+       // variables
+       byte_t isOK = 0;
+       byte_t dataoutbuf[16];
+    
+       memcpy(key, datain, 16);
+       // clear trace
+       //iso14a_clear_trace();
+       //iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    
+       LED_A_ON();
+       LED_B_OFF();
+       LED_C_OFF();
+
+//     Dbprintf("Sending %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+//              key[0],key[1],key[2],key[3],key[4],key[5],key[6],key[7],key[8],
+//              key[9],key[10],key[11],key[12],key[13],key[14],key[15]);
+       
+       if(mifare_desfire_des_auth2(cuid, key, dataoutbuf)){
+           if (MF_DBGLEVEL >= 1) Dbprintf("Authentication part2: Fail...");    
+       }
+       isOK=1;
+       if (MF_DBGLEVEL >= 2)   DbpString("AUTH 2 FINISHED");
+    
+       LED_B_ON();
+        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,12);
+       LED_B_OFF();
+    
+    // Thats it...
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       LEDsoff();
+}
\ No newline at end of file
index 3c00a3437b25fc9c48764f96b996a8b2fca86e76..243d8128a0567784f72319ae4e30422e68736b50 100644 (file)
@@ -1,28 +1,28 @@
-//-----------------------------------------------------------------------------\r
-// Merlok - June 2011\r
-// Gerhard de Koning Gans - May 2008\r
-// Hagen Fritsch - June 2010\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
-// the license.\r
-//-----------------------------------------------------------------------------\r
-// Routines to support ISO 14443 type A.\r
-//-----------------------------------------------------------------------------\r
-\r
-#ifndef __MIFARECMD_H\r
-#define __MIFARECMD_H\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 "common.h"\r
-\r
-\r
+//-----------------------------------------------------------------------------
+// Merlok - June 2011
+// Gerhard de Koning Gans - May 2008
+// Hagen Fritsch - June 2010
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Routines to support ISO 14443 type A.
+//-----------------------------------------------------------------------------
+
+#ifndef __MIFARECMD_H
+#define __MIFARECMD_H
+
+#include "proxmark3.h"
+#include "apps.h"
+#include "util.h"
+#include "string.h"
+
+#include "iso14443crc.h"
+#include "iso14443a.h"
+#include "crapto1.h"
+#include "mifareutil.h"
+#include "common.h"
+
+
 #endif
\ No newline at end of file
index b847043bbd8a00237e54a77a4080ac383f9705fb..ce43dc3b03ca13c8a107feec668e572a5d8e33c2 100644 (file)
@@ -1,84 +1,86 @@
-//-----------------------------------------------------------------------------\r
-// Merlok, May 2011, 2012\r
-// Many authors, whom made it possible\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
-// the license.\r
-//-----------------------------------------------------------------------------\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
-\r
-int MF_DBGLEVEL = MF_DBG_ALL;\r
-\r
-// memory management\r
-uint8_t* mifare_get_bigbufptr(void) {\r
-       return (((uint8_t *)BigBuf) + MIFARE_BUFF_OFFSET);      // was 3560 - tied to other size changes\r
-}\r
-uint8_t* eml_get_bigbufptr_sendbuf(void) {\r
-       return (((uint8_t *)BigBuf) + RECV_CMD_OFFSET); \r
-}\r
-uint8_t* eml_get_bigbufptr_recbuf(void) {\r
-       return (((uint8_t *)BigBuf) + MIFARE_BUFF_OFFSET);\r
-}\r
-uint8_t* eml_get_bigbufptr_cardmem(void) {\r
-       return (((uint8_t *)BigBuf) + CARD_MEMORY);\r
-}\r
-\r
-// crypto1 helpers\r
-void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len){\r
-       uint8_t bt = 0;\r
-       int i;\r
-       \r
-       if (len != 1) {\r
-               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
-               data[0] = bt;\r
-       }\r
-       return;\r
-}\r
-\r
-void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, int len, uint32_t *par) {\r
-       uint8_t bt = 0;\r
-       int i;\r
-       uint32_t mltpl = 1 << (len - 1); // for len=18 it=0x20000\r
-       *par = 0;\r
-       for (i = 0; i < len; i++) {\r
-               bt = data[i];\r
-               data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];\r
-               *par = (*par >> 1) | ( ((filter(pcs->odd) ^ oddparity(bt)) & 0x01) * mltpl );\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
-       return bt;\r
-}\r
-\r
-// send commands\r
-int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint32_t *timing)\r
-{\r
+//-----------------------------------------------------------------------------
+// Merlok, May 2011, 2012
+// Many authors, whom made it possible
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Work with mifare cards.
+//-----------------------------------------------------------------------------
+
+#include "proxmark3.h"
+#include "apps.h"
+#include "util.h"
+#include "string.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "iso14443crc.h"
+#include "iso14443a.h"
+#include "crapto1.h"
+#include "mifareutil.h"
+
+int MF_DBGLEVEL = MF_DBG_ALL;
+
+// memory management
+uint8_t* mifare_get_bigbufptr(void) {
+       return (((uint8_t *)BigBuf) + MIFARE_BUFF_OFFSET);      // was 3560 - tied to other size changes
+}
+uint8_t* eml_get_bigbufptr_sendbuf(void) {
+       return (((uint8_t *)BigBuf) + RECV_CMD_OFFSET); 
+}
+uint8_t* eml_get_bigbufptr_recbuf(void) {
+       return (((uint8_t *)BigBuf) + MIFARE_BUFF_OFFSET);
+}
+uint8_t* eml_get_bigbufptr_cardmem(void) {
+       return (((uint8_t *)BigBuf) + CARD_MEMORY);
+}
+
+// crypto1 helpers
+void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len){
+       uint8_t bt = 0;
+       int i;
+       
+       if (len != 1) {
+               for (i = 0; i < len; i++)
+                       data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];
+       } else {
+               bt = 0;
+               for (i = 0; i < 4; i++)
+                       bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data[0], i)) << i;
+                               
+               data[0] = bt;
+       }
+       return;
+}
+
+void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, int len, uint32_t *par) {
+       uint8_t bt = 0;
+       int i;
+       uint32_t mltpl = 1 << (len - 1); // for len=18 it=0x20000
+       *par = 0;
+       for (i = 0; i < len; i++) {
+               bt = data[i];
+               data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];
+               *par = (*par >> 1) | ( ((filter(pcs->odd) ^ oddparity(bt)) & 0x01) * mltpl );
+       }       
+       return;
+}
+
+uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {
+       uint8_t bt = 0;
+       int i;
+
+       for (i = 0; i < 4; i++)
+               bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, i)) << i;
+               
+       return bt;
+}
+
+// send commands
+int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint32_t *timing)
+{
        return mifare_sendcmd_shortex(pcs, crypted, cmd, data, answer, NULL, timing);
 }
 
@@ -88,11 +90,7 @@ int mifare_sendcmd_short_special(struct Crypto1State *pcs, uint8_t crypted, uint
         //uint32_t par=0;
 
         dcmd[0] = cmd;
-        dcmd[1] = data[0];
-       dcmd[2] = data[1];
-       dcmd[3] = data[2];
-       dcmd[4] = data[3];
-       dcmd[5] = data[4];
+        memcpy(dcmd+1,data,5);
        AppendCrc14443a(dcmd, 6);
        //Dbprintf("Data command: %02x", dcmd[0]);
        //Dbprintf("Data R: %02x %02x %02x %02x %02x %02x %02x", dcmd[1],dcmd[2],dcmd[3],dcmd[4],dcmd[5],dcmd[6],dcmd[7]);
@@ -105,183 +103,266 @@ int mifare_sendcmd_short_special(struct Crypto1State *pcs, uint8_t crypted, uint
                 if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Card timeout.");
                 return 2;
         }
+
+       return len;
+}
+
+int mifare_sendcmd_short_mfucauth(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint32_t *timing)
+{
+        uint8_t dcmd[19];//, ecmd[4];
+       int len; 
+        //uint32_t par=0;
+
+        dcmd[0] = cmd;
+        memcpy(dcmd+1,data,16);
+       AppendCrc14443a(dcmd, 17);
+       //Dbprintf("Data command: %02x", dcmd[0]);
+       //Dbprintf("Data R: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", dcmd[0], dcmd[1],dcmd[2],dcmd[3],dcmd[4],dcmd[5],dcmd[6],dcmd[7],dcmd[8],dcmd[9],dcmd[10],dcmd[11],dcmd[12],dcmd[13],dcmd[14],dcmd[15],dcmd[16],dcmd[17],dcmd[18]);
+
+       //uint32_t time=0;
+       //uint8_t wupa[]       = { 0x52 };
+       //ReaderTransmitBitsPar(wupa,7,0, NULL);
+        // Receive the ATQA
+       //if(!ReaderReceive(answer)) return 0;
+       ReaderTransmit(dcmd, sizeof(dcmd), timing);
+       len = ReaderReceive(answer);
+       if(!len)
+       {
+                if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Card timeout.");
+                len = ReaderReceive(answer);
+        }
+        if(len==1)
+       {
+                if (MF_DBGLEVEL >= 1)   Dbprintf("NAK - Authentication failed.");
+                return 1;
+        }
        return len;
 }
 
 int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint32_t * parptr, uint32_t *timing)
 {
        uint8_t dcmd[4], ecmd[4];
-       uint32_t pos, par, res;\r
-\r
-       dcmd[0] = cmd;\r
-       dcmd[1] = data;\r
-       AppendCrc14443a(dcmd, 2);\r
-       \r
-       memcpy(ecmd, dcmd, sizeof(dcmd));\r
-       \r
-       if (crypted) {\r
-               par = 0;\r
-               for (pos = 0; pos < 4; pos++)\r
-               {\r
-                       ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];\r
-                       par = (par >> 1) | ( ((filter(pcs->odd) ^ oddparity(dcmd[pos])) & 0x01) * 0x08 );\r
-               }       \r
-\r
-               ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);\r
-\r
-       } else {\r
-               ReaderTransmit(dcmd, sizeof(dcmd), timing);\r
-       }\r
-\r
-       int len = ReaderReceivePar(answer, &par);\r
-       \r
-       if (parptr) *parptr = par;\r
-\r
-       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
-                       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
-       return len;\r
-}\r
-\r
-// mifare commands\r
-int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested) \r
-{\r
-       return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL);\r
-}\r
-\r
-int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested, uint32_t * ntptr, uint32_t *timing) \r
-{\r
-       // variables\r
-       int len;        \r
-       uint32_t pos;\r
-       uint8_t tmp4[4];\r
-       byte_t par = 0;\r
-       byte_t ar[4];\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 = mifare_get_bigbufptr();\r
-\r
-       // Transmit MIFARE_CLASSIC_AUTH\r
-       len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer, timing);\r
-       if (MF_DBGLEVEL >= 4)   Dbprintf("rand nonce len: %x", len);  \r
-       if (len != 4) return 1;\r
-       \r
-       ar[0] = 0x55;\r
-       ar[1] = 0x41;\r
-       ar[2] = 0x49;\r
-       ar[3] = 0x92; \r
-       \r
-       // Save the tag nonce (nt)\r
-       nt = bytes_to_num(receivedAnswer, 4);\r
-\r
-       //  ----------------------------- crypto1 create\r
-       if (isNested)\r
-               crypto1_destroy(pcs);\r
-\r
-       // Init cipher with key\r
-       crypto1_create(pcs, ui64Key);\r
-\r
-       if (isNested == AUTH_NESTED) {\r
-               // decrypt nt with help of new key \r
-               nt = crypto1_word(pcs, nt ^ uid, 1) ^ nt;\r
-       } else {\r
-               // Load (plain) uid^nt into the cipher\r
-               crypto1_word(pcs, nt ^ uid, 0);\r
-       }\r
-\r
-       // some statistic\r
-       if (!ntptr && (MF_DBGLEVEL >= 3))\r
-               Dbprintf("auth uid: %08x nt: %08x", uid, nt);  \r
-       \r
-       // save Nt\r
-       if (ntptr)\r
-               *ntptr = nt;\r
-\r
-       par = 0;\r
-       // Generate (encrypted) nr+parity by loading it into the cipher (Nr)\r
-       for (pos = 0; pos < 4; pos++)\r
-       {\r
-               mf_nr_ar[pos] = crypto1_byte(pcs, ar[pos], 0) ^ ar[pos];\r
-               par = (par >> 1) | ( ((filter(pcs->odd) ^ oddparity(ar[pos])) & 0x01) * 0x80 );\r
-       }       \r
-               \r
-       // Skip 32 bits in pseudo random generator\r
-       nt = prng_successor(nt,32);\r
-\r
-       //  ar+parity\r
-       for (pos = 4; pos < 8; pos++)\r
-       {\r
-               nt = prng_successor(nt,8);\r
-               mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);\r
-               par = (par >> 1)| ( ((filter(pcs->odd) ^ oddparity(nt & 0xff)) & 0x01) * 0x80 );\r
-       }       \r
-               \r
-       // Transmit reader nonce and reader answer\r
-       ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);\r
-\r
-       // Receive 4 bit answer\r
-       len = ReaderReceive(receivedAnswer);\r
-       if (!len)\r
-       {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Card timeout.");\r
-               return 2;\r
-       }\r
-       \r
-       memcpy(tmp4, receivedAnswer, 4);\r
-       ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0,0);\r
-       \r
-       if (ntpp != bytes_to_num(tmp4, 4)) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Error card response.");\r
-               return 3;\r
-       }\r
-\r
-       return 0;\r
-}\r
-\r
-int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) \r
-{\r
-       // variables\r
-       int len;        \r
-       uint8_t bt[2];\r
-       \r
-       uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
-       \r
-       // command MIFARE_CLASSIC_READBLOCK\r
-       len = mifare_sendcmd_short(pcs, 1, 0x30, blockNo, receivedAnswer, NULL);\r
-       if (len == 1) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  \r
-               return 1;\r
-       }\r
-       if (len != 18) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: card timeout. len: %x", len);  \r
-               return 2;\r
-       }\r
-\r
-       memcpy(bt, receivedAnswer + 16, 2);\r
-       AppendCrc14443a(receivedAnswer, 16);\r
-       if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd CRC response error.");  \r
-               return 3;\r
-       }\r
-       \r
-       memcpy(blockData, receivedAnswer, 16);\r
+       uint32_t pos, par, res;
+
+       dcmd[0] = cmd;
+       dcmd[1] = data;
+       AppendCrc14443a(dcmd, 2);
+       
+       memcpy(ecmd, dcmd, sizeof(dcmd));
+       
+       if (crypted) {
+               par = 0;
+               for (pos = 0; pos < 4; pos++)
+               {
+                       ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];
+                       par = (par >> 1) | ( ((filter(pcs->odd) ^ oddparity(dcmd[pos])) & 0x01) * 0x08 );
+               }       
+
+               ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);
+
+       } else {
+               ReaderTransmit(dcmd, sizeof(dcmd), timing);
+       }
+
+       int len = ReaderReceivePar(answer, &par);
+       
+       if (parptr) *parptr = par;
+
+       if (crypted == CRYPT_ALL) {
+               if (len == 1) {
+                       res = 0;
+                       for (pos = 0; pos < 4; pos++)
+                               res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], pos)) << pos;
+                               
+                       answer[0] = res;
+                       
+               } else {
+                       for (pos = 0; pos < len; pos++)
+                       {
+                               answer[pos] = crypto1_byte(pcs, 0x00, 0) ^ answer[pos];
+                       }
+               }
+       }
+       
+       return len;
+}
+
+// mifare commands
+int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested) 
+{
+       return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL);
+}
+
+int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested, uint32_t * ntptr, uint32_t *timing) 
+{
+       // variables
+       int len;        
+       uint32_t pos;
+       uint8_t tmp4[4];
+       byte_t par = 0;
+       byte_t ar[4];
+       uint32_t nt, ntpp; // Supplied tag nonce
+       
+       uint8_t mf_nr_ar[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
+       uint8_t* receivedAnswer = mifare_get_bigbufptr();
+
+       // Transmit MIFARE_CLASSIC_AUTH
+       len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer, timing);
+       if (MF_DBGLEVEL >= 4)   Dbprintf("rand nonce len: %x", len);  
+       if (len != 4) return 1;
+       
+       ar[0] = 0x55;
+       ar[1] = 0x41;
+       ar[2] = 0x49;
+       ar[3] = 0x92; 
+       
+       // Save the tag nonce (nt)
+       nt = bytes_to_num(receivedAnswer, 4);
+
+       //  ----------------------------- crypto1 create
+       if (isNested)
+               crypto1_destroy(pcs);
+
+       // Init cipher with key
+       crypto1_create(pcs, ui64Key);
+
+       if (isNested == AUTH_NESTED) {
+               // decrypt nt with help of new key 
+               nt = crypto1_word(pcs, nt ^ uid, 1) ^ nt;
+       } else {
+               // Load (plain) uid^nt into the cipher
+               crypto1_word(pcs, nt ^ uid, 0);
+       }
+
+       // some statistic
+       if (!ntptr && (MF_DBGLEVEL >= 3))
+               Dbprintf("auth uid: %08x nt: %08x", uid, nt);  
+       
+       // save Nt
+       if (ntptr)
+               *ntptr = nt;
+
+       par = 0;
+       // Generate (encrypted) nr+parity by loading it into the cipher (Nr)
+       for (pos = 0; pos < 4; pos++)
+       {
+               mf_nr_ar[pos] = crypto1_byte(pcs, ar[pos], 0) ^ ar[pos];
+               par = (par >> 1) | ( ((filter(pcs->odd) ^ oddparity(ar[pos])) & 0x01) * 0x80 );
+       }       
+               
+       // Skip 32 bits in pseudo random generator
+       nt = prng_successor(nt,32);
+
+       //  ar+parity
+       for (pos = 4; pos < 8; pos++)
+       {
+               nt = prng_successor(nt,8);
+               mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);
+               par = (par >> 1)| ( ((filter(pcs->odd) ^ oddparity(nt & 0xff)) & 0x01) * 0x80 );
+       }       
+               
+       // Transmit reader nonce and reader answer
+       ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);
+
+       // Receive 4 bit answer
+       len = ReaderReceive(receivedAnswer);
+       if (!len)
+       {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Card timeout.");
+               return 2;
+       }
+       
+       memcpy(tmp4, receivedAnswer, 4);
+       ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0,0);
+       
+       if (ntpp != bytes_to_num(tmp4, 4)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Error card response.");
+               return 3;
+       }
+
+       return 0;
+}
+
+int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) 
+{
+       // variables
+       int len;        
+       uint8_t bt[2];
+       
+       uint8_t* receivedAnswer = mifare_get_bigbufptr();
+       
+       // command MIFARE_CLASSIC_READBLOCK
+       len = mifare_sendcmd_short(pcs, 1, 0x30, blockNo, receivedAnswer, NULL);
+       if (len == 1) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  
+               return 1;
+       }
+       if (len != 18) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: card timeout. len: %x", len);  
+               return 2;
+       }
+
+       memcpy(bt, receivedAnswer + 16, 2);
+       AppendCrc14443a(receivedAnswer, 16);
+       if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd CRC response error.");  
+               return 3;
+       }
+       
+       memcpy(blockData, receivedAnswer, 16);
        return 0;
 }
 
+int mifare_ultra_auth1(uint32_t uid, uint8_t *blockData){
+       // variables
+       int len;
+       
+       uint8_t* receivedAnswer = mifare_get_bigbufptr();
+       
+       // command MIFARE_CLASSIC_READBLOCK
+       len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, receivedAnswer,NULL);
+       if (len == 1) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+               return 1;
+       }
+       if (len == 11) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Auth1 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+                 receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],
+                 receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],
+                 receivedAnswer[10]);
+               memcpy(blockData, receivedAnswer, 11);
+               return 0;
+       }
+       //else something went wrong???
+       return 1;
+}
+
+int mifare_ultra_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){
+       // variables
+       int len;
+       
+       uint8_t* receivedAnswer = mifare_get_bigbufptr();
+       
+       
+       // command MIFARE_CLASSIC_READBLOCK
+       len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, key, receivedAnswer,NULL);
+       if (len == 1) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+               return 1;
+       }
+       if (len == 11){
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Auth2 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+                 receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],
+                 receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],
+                 receivedAnswer[10]);
+               memcpy(blockData, receivedAnswer, 11);
+               return 0;
+       }
+       //something went wrong?
+       return 1;
+}
+
 int mifare_ultra_readblock(uint32_t uid, uint8_t blockNo, uint8_t *blockData)
 {
        // variables
@@ -316,47 +397,47 @@ int mifare_ultra_readblock(uint32_t uid, uint8_t blockNo, uint8_t *blockData)
 int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) 
 {
        // variables
-       int len, i;     \r
-       uint32_t pos;\r
-       uint32_t par = 0;\r
-       byte_t res;\r
-       \r
-       uint8_t d_block[18], d_block_enc[18];\r
-       uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
-       \r
-       // command MIFARE_CLASSIC_WRITEBLOCK\r
-       len = mifare_sendcmd_short(pcs, 1, 0xA0, blockNo, receivedAnswer, NULL);\r
-\r
-       if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  \r
-               return 1;\r
-       }\r
-       \r
-       memcpy(d_block, blockData, 16);\r
-       AppendCrc14443a(d_block, 16);\r
-       \r
-       // crypto\r
-       par = 0;\r
-       for (pos = 0; pos < 18; pos++)\r
-       {\r
-               d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];\r
-               par = (par >> 1) | ( ((filter(pcs->odd) ^ oddparity(d_block[pos])) & 0x01) * 0x20000 );\r
-       }       \r
-\r
-       ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);\r
-\r
-       // Receive the response\r
-       len = ReaderReceive(receivedAnswer);    \r
-\r
-       res = 0;\r
-       for (i = 0; i < 4; i++)\r
-               res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], i)) << i;\r
-\r
-       if ((len != 1) || (res != 0x0A)) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd send data2 Error: %02x", res);  \r
-               return 2;\r
-       }\r
-       \r
+       int len, i;     
+       uint32_t pos;
+       uint32_t par = 0;
+       byte_t res;
+       
+       uint8_t d_block[18], d_block_enc[18];
+       uint8_t* receivedAnswer = mifare_get_bigbufptr();
+       
+       // command MIFARE_CLASSIC_WRITEBLOCK
+       len = mifare_sendcmd_short(pcs, 1, 0xA0, blockNo, receivedAnswer, NULL);
+
+       if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  
+               return 1;
+       }
+       
+       memcpy(d_block, blockData, 16);
+       AppendCrc14443a(d_block, 16);
+       
+       // crypto
+       par = 0;
+       for (pos = 0; pos < 18; pos++)
+       {
+               d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];
+               par = (par >> 1) | ( ((filter(pcs->odd) ^ oddparity(d_block[pos])) & 0x01) * 0x20000 );
+       }       
+
+       ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);
+
+       // Receive the response
+       len = ReaderReceive(receivedAnswer);    
+
+       res = 0;
+       for (i = 0; i < 4; i++)
+               res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], i)) << i;
+
+       if ((len != 1) || (res != 0x0A)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd send data2 Error: %02x", res);  
+               return 2;
+       }
+       
        return 0;
 }
 
@@ -422,17 +503,17 @@ int mifare_ultra_special_writeblock(uint32_t uid, uint8_t blockNo, uint8_t *bloc
 int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) 
 {
        // variables
-       int len;        \r
-       \r
-       // Mifare HALT\r
-       uint8_t* receivedAnswer = mifare_get_bigbufptr();\r
-\r
-       len = mifare_sendcmd_short(pcs, pcs == NULL ? 0:1, 0x50, 0x00, receivedAnswer, NULL);\r
-       if (len != 0) {\r
-               if (MF_DBGLEVEL >= 1)   Dbprintf("halt error. response len: %x", len);  \r
-               return 1;\r
-       }\r
-\r
+       int len;        
+       
+       // Mifare HALT
+       uint8_t* receivedAnswer = mifare_get_bigbufptr();
+
+       len = mifare_sendcmd_short(pcs, pcs == NULL ? 0:1, 0x50, 0x00, receivedAnswer, NULL);
+       if (len != 0) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("halt error. response len: %x", len);  
+               return 1;
+       }
+
        return 0;
 }
 
@@ -456,91 +537,196 @@ int mifare_ultra_halt(uint32_t uid)
 // work with emulator memory
 void emlSetMem(uint8_t *data, int blockNum, int blocksCount) {
        uint8_t* emCARD = eml_get_bigbufptr_cardmem();
-       \r
-       memcpy(emCARD + blockNum * 16, data, blocksCount * 16);\r
-}\r
-\r
-void emlGetMem(uint8_t *data, int blockNum, int blocksCount) {\r
-       uint8_t* emCARD = eml_get_bigbufptr_cardmem();\r
-       \r
-       memcpy(data, emCARD + blockNum * 16, blocksCount * 16);\r
-}\r
-\r
-void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount) {\r
-       uint8_t* emCARD = eml_get_bigbufptr_cardmem();\r
-       \r
-       memcpy(data, emCARD + bytePtr, byteCount);\r
-}\r
-\r
-int emlCheckValBl(int blockNum) {\r
-       uint8_t* emCARD = eml_get_bigbufptr_cardmem();\r
-       uint8_t* data = emCARD + blockNum * 16;\r
-\r
-       if ((data[0] != (data[4] ^ 0xff)) || (data[0] != data[8]) ||\r
-                       (data[1] != (data[5] ^ 0xff)) || (data[1] != data[9]) ||\r
-                       (data[2] != (data[6] ^ 0xff)) || (data[2] != data[10]) ||\r
-                       (data[3] != (data[7] ^ 0xff)) || (data[3] != data[11]) ||\r
-                       (data[12] != (data[13] ^ 0xff)) || (data[12] != data[14]) ||\r
-                       (data[12] != (data[15] ^ 0xff))\r
-                ) \r
-               return 1;\r
-       return 0;\r
-}\r
-\r
-int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {\r
-       uint8_t* emCARD = eml_get_bigbufptr_cardmem();\r
-       uint8_t* data = emCARD + blockNum * 16;\r
-       \r
-       if (emlCheckValBl(blockNum)) {\r
-               return 1;\r
-       }\r
-       \r
-       memcpy(blReg, data, 4);\r
-       *blBlock = data[12];\r
-       \r
-       return 0;\r
-}\r
-\r
-int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {\r
-       uint8_t* emCARD = eml_get_bigbufptr_cardmem();\r
-       uint8_t* data = emCARD + blockNum * 16;\r
-       \r
-       memcpy(data + 0, &blReg, 4);\r
-       memcpy(data + 8, &blReg, 4);\r
-       blReg = blReg ^ 0xffffffff;\r
-       memcpy(data + 4, &blReg, 4);\r
-       \r
-       data[12] = blBlock;\r
-       data[13] = blBlock ^ 0xff;\r
-       data[14] = blBlock;\r
-       data[15] = blBlock ^ 0xff;\r
-       \r
-       return 0;\r
-}\r
-\r
-uint64_t emlGetKey(int sectorNum, int keyType) {\r
-       uint8_t key[6];\r
-       uint8_t* emCARD = eml_get_bigbufptr_cardmem();\r
-       \r
-       memcpy(key, emCARD + 3 * 16 + sectorNum * 4 * 16 + 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 = eml_get_bigbufptr_cardmem();\r
-       \r
-       memset(emCARD, 0, CARD_MEMORY_LEN);\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
-       }       \r
-\r
-       // uid\r
-       emlSetMem((uint8_t *)uid, 0, 1);\r
-       return;\r
-}\r
+       
+       memcpy(emCARD + blockNum * 16, data, blocksCount * 16);
+}
+
+void emlGetMem(uint8_t *data, int blockNum, int blocksCount) {
+       uint8_t* emCARD = eml_get_bigbufptr_cardmem();
+       
+       memcpy(data, emCARD + blockNum * 16, blocksCount * 16);
+}
+
+void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount) {
+       uint8_t* emCARD = eml_get_bigbufptr_cardmem();
+       
+       memcpy(data, emCARD + bytePtr, byteCount);
+}
+
+int emlCheckValBl(int blockNum) {
+       uint8_t* emCARD = eml_get_bigbufptr_cardmem();
+       uint8_t* data = emCARD + blockNum * 16;
+
+       if ((data[0] != (data[4] ^ 0xff)) || (data[0] != data[8]) ||
+                       (data[1] != (data[5] ^ 0xff)) || (data[1] != data[9]) ||
+                       (data[2] != (data[6] ^ 0xff)) || (data[2] != data[10]) ||
+                       (data[3] != (data[7] ^ 0xff)) || (data[3] != data[11]) ||
+                       (data[12] != (data[13] ^ 0xff)) || (data[12] != data[14]) ||
+                       (data[12] != (data[15] ^ 0xff))
+                ) 
+               return 1;
+       return 0;
+}
+
+int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {
+       uint8_t* emCARD = eml_get_bigbufptr_cardmem();
+       uint8_t* data = emCARD + blockNum * 16;
+       
+       if (emlCheckValBl(blockNum)) {
+               return 1;
+       }
+       
+       memcpy(blReg, data, 4);
+       *blBlock = data[12];
+       
+       return 0;
+}
+
+int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {
+       uint8_t* emCARD = eml_get_bigbufptr_cardmem();
+       uint8_t* data = emCARD + blockNum * 16;
+       
+       memcpy(data + 0, &blReg, 4);
+       memcpy(data + 8, &blReg, 4);
+       blReg = blReg ^ 0xffffffff;
+       memcpy(data + 4, &blReg, 4);
+       
+       data[12] = blBlock;
+       data[13] = blBlock ^ 0xff;
+       data[14] = blBlock;
+       data[15] = blBlock ^ 0xff;
+       
+       return 0;
+}
+
+uint64_t emlGetKey(int sectorNum, int keyType) {
+       uint8_t key[6];
+       uint8_t* emCARD = eml_get_bigbufptr_cardmem();
+       
+       memcpy(key, emCARD + 3 * 16 + sectorNum * 4 * 16 + keyType * 10, 6);
+       return bytes_to_num(key, 6);
+}
+
+void emlClearMem(void) {
+       int b;
+       
+       const uint8_t trailer[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x80, 0x69, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+       const uint8_t uid[]   =   {0xe6, 0x84, 0x87, 0xf3, 0x16, 0x88, 0x04, 0x00, 0x46, 0x8e, 0x45, 0x55, 0x4d, 0x70, 0x41, 0x04};
+       uint8_t* emCARD = eml_get_bigbufptr_cardmem();
+       
+       memset(emCARD, 0, CARD_MEMORY_LEN);
+       
+       // fill sectors trailer data
+       for(b = 3; b < 256; b<127?(b+=4):(b+=16)) {
+               emlSetMem((uint8_t *)trailer, b , 1);
+       }       
+
+       // uid
+       emlSetMem((uint8_t *)uid, 0, 1);
+       return;
+}
+
+//
+//DESFIRE
+//
+
+int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint8_t *timing)
+{
+        uint8_t dcmd[5];//, ecmd[4];
+       //dcmd= (uint8_t *) malloc(data_len+3);
+        //uint32_t par=0;
+
+        dcmd[0] = cmd;
+        memcpy(dcmd+1,data,2);
+       AppendCrc14443a(dcmd, 3);
+       //Dbprintf("Data command: %02x", dcmd[0]);
+       //Dbprintf("Data R: %02x %02x", dcmd[1],dcmd[2]);
+
+        //memcpy(ecmd, dcmd, sizeof(dcmd));
+       ReaderTransmit(dcmd, sizeof(dcmd), NULL);
+       int len = ReaderReceive(answer);
+       if(!len)
+       {
+                if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Card timeout.");
+                return 2;
+        }
+        //free(dcmd);
+       return len;
+}
+
+
+int mifare_sendcmd_special2(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint8_t *timing)
+{
+        uint8_t dcmd[20];//, ecmd[4];
+       //dcmd= (uint8_t *) malloc(data_len+3);
+        //uint32_t par=0;
+
+        dcmd[0] = cmd;
+        memcpy(dcmd+1,data,17);
+       AppendCrc14443a(dcmd, 18);
+       //Dbprintf("Data command: %02x", dcmd[0]);
+       //Dbprintf("Data R: %02x %02x %02x %02x", dcmd[1],dcmd[2],dcmd[3],dcmd[4]);
+
+        //memcpy(ecmd, dcmd, sizeof(dcmd));
+       ReaderTransmit(dcmd, sizeof(dcmd), NULL);
+       int len = ReaderReceive(answer);
+       if(!len)
+       {
+                if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Card timeout.");
+                return 2;
+        }
+        //free(dcmd);
+       return len;
+}
+
+int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData){
+       // variables
+       int len;
+       //           load key, keynumber
+       uint8_t data[2]={0x0a, 0x00};
+       //uint8_t data_len=2;
+       uint8_t* receivedAnswer = mifare_get_bigbufptr();
+       
+       // command MIFARE_CLASSIC_READBLOCK
+       len = mifare_sendcmd_special(NULL, 1, 0x02, data, receivedAnswer,NULL);
+       if (len == 1) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+               return 1;
+       }
+       if (len == 12) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Auth1 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+                 receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],
+                 receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],
+                 receivedAnswer[10],receivedAnswer[11]);
+               memcpy(blockData, receivedAnswer, 12);
+               return 0;
+       }
+       //else something went wrong???
+       return 1;
+}
+
+int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){
+       // variables
+       int len;
+       uint8_t data[17]={0xaf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+       memcpy(data+1,key,16);
+       uint8_t* receivedAnswer = mifare_get_bigbufptr();
+       
+       
+       // command MIFARE_CLASSIC_READBLOCK
+       len = mifare_sendcmd_special2(NULL, 1, 0x03, data, receivedAnswer,NULL);
+       if ((receivedAnswer[0] == 0x03)&&(receivedAnswer[1] == 0xae)) {
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Auth Error: %02x %02x", receivedAnswer[0], receivedAnswer[1]);
+               return 1;
+       }
+       if (len == 12){
+               if (MF_DBGLEVEL >= 1)   Dbprintf("Auth2 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+                 receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],
+                 receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],
+                 receivedAnswer[10],receivedAnswer[11]);
+               memcpy(blockData, receivedAnswer, 12);
+               return 0;
+       }
+       //something went wrong?
+       return 1;
+}
\ No newline at end of file
index ad637ea02fd790492be2c26480bd3d982f9d469d..9f1ede69f838eb1b1e4171c305158875d157217a 100644 (file)
@@ -1,68 +1,71 @@
-//-----------------------------------------------------------------------------\r
-// Merlok, May 2011\r
-// Many authors, that makes it possible\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
-// the license.\r
-//-----------------------------------------------------------------------------\r
-// code for work with mifare cards.\r
-//-----------------------------------------------------------------------------\r
-\r
-#ifndef __MIFAREUTIL_H\r
-#define __MIFAREUTIL_H\r
-\r
-// mifare authentication\r
-#define CRYPT_NONE    0\r
-#define CRYPT_ALL     1\r
-#define CRYPT_REQUEST 2\r
-#define AUTH_FIRST    0\r
-#define AUTH_NESTED   2\r
-\r
-// mifare 4bit card answers\r
-#define CARD_ACK      0x0A  // 1010 - ACK\r
-#define CARD_NACK_NA  0x04  // 0100 - NACK, not allowed (command not allowed)\r
-#define CARD_NACK_TR  0x05  // 0101 - NACK, transmission error\r
-\r
-// reader voltage field detector\r
-#define MF_MINFIELDV      4000\r
-\r
-// debug\r
-// 0 - no debug messages 1 - error messages 2 - all messages 4 - extended debug mode\r
-#define MF_DBG_NONE          0\r
-#define MF_DBG_ERROR         1\r
-#define MF_DBG_ALL           2\r
-#define MF_DBG_EXTENDED      4\r
-\r
-extern int MF_DBGLEVEL;\r
-\r
-//mifare emulator states\r
-#define MFEMUL_NOFIELD      0\r
-#define MFEMUL_IDLE         1\r
-#define MFEMUL_SELECT1      2\r
-#define MFEMUL_SELECT2      3\r
-#define MFEMUL_AUTH1        4\r
-#define MFEMUL_AUTH2        5\r
-#define MFEMUL_WORK            6\r
-#define MFEMUL_WRITEBL2     7\r
-#define MFEMUL_INTREG_INC   8\r
-#define MFEMUL_INTREG_DEC   9\r
-#define MFEMUL_INTREG_REST 10\r
-#define MFEMUL_HALTED      11\r
-\r
-#define cardSTATE_TO_IDLE() cardSTATE = MFEMUL_IDLE; LED_B_OFF(); LED_C_OFF();\r
-\r
+//-----------------------------------------------------------------------------
+// Merlok, May 2011
+// Many authors, that makes it possible
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// code for work with mifare cards.
+//-----------------------------------------------------------------------------
+
+#ifndef __MIFAREUTIL_H
+#define __MIFAREUTIL_H
+
+// mifare authentication
+#define CRYPT_NONE    0
+#define CRYPT_ALL     1
+#define CRYPT_REQUEST 2
+#define AUTH_FIRST    0
+#define AUTH_NESTED   2
+
+// mifare 4bit card answers
+#define CARD_ACK      0x0A  // 1010 - ACK
+#define CARD_NACK_NA  0x04  // 0100 - NACK, not allowed (command not allowed)
+#define CARD_NACK_TR  0x05  // 0101 - NACK, transmission error
+
+// reader voltage field detector
+#define MF_MINFIELDV      4000
+
+// debug
+// 0 - no debug messages 1 - error messages 2 - all messages 4 - extended debug mode
+#define MF_DBG_NONE          0
+#define MF_DBG_ERROR         1
+#define MF_DBG_ALL           2
+#define MF_DBG_EXTENDED      4
+
+extern int MF_DBGLEVEL;
+
+//mifare emulator states
+#define MFEMUL_NOFIELD      0
+#define MFEMUL_IDLE         1
+#define MFEMUL_SELECT1      2
+#define MFEMUL_SELECT2      3
+#define MFEMUL_AUTH1        4
+#define MFEMUL_AUTH2        5
+#define MFEMUL_WORK            6
+#define MFEMUL_WRITEBL2     7
+#define MFEMUL_INTREG_INC   8
+#define MFEMUL_INTREG_DEC   9
+#define MFEMUL_INTREG_REST 10
+#define MFEMUL_HALTED      11
+
+#define cardSTATE_TO_IDLE() cardSTATE = MFEMUL_IDLE; LED_B_OFF(); LED_C_OFF();
+
 //functions
 uint8_t* mifare_get_bigbufptr(void);
 int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint32_t *timing);
 int mifare_sendcmd_short_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t* amswer, uint8_t *timing);
+int mifare_sendcmd_short_mfucauth(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t* amswer, uint32_t *timing);
 int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint32_t * parptr, uint32_t *timing);
 
 int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, \
-                                                                                               uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested);\r
+uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested);
 int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, \
-                                                                                                       uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested, uint32_t * ntptr, uint32_t *timing);
+uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested, uint32_t * ntptr, uint32_t *timing);
 int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData); 
+int mifare_ultra_auth1(uint32_t cuid, uint8_t *blockData);
+int mifare_ultra_auth2(uint32_t cuid, uint8_t *key, uint8_t *blockData);
 int mifare_ultra_readblock(uint32_t uid, uint8_t blockNo, uint8_t *blockData);
 int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);
 int mifare_ultra_writeblock(uint32_t uid, uint8_t blockNo, uint8_t *blockData);
@@ -70,23 +73,27 @@ int mifare_ultra_special_writeblock(uint32_t uid, uint8_t blockNo, uint8_t *bloc
 int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid); 
 int mifare_ultra_halt(uint32_t uid);
 
+//desfire
+int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData);
+int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData);
+
 // crypto functions
 void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *receivedCmd, int len);
-void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, int len, uint32_t *par);\r
-uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data);\r
-\r
-// memory management\r
-uint8_t* mifare_get_bigbufptr(void);\r
-uint8_t* eml_get_bigbufptr_sendbuf(void);\r
-uint8_t* eml_get_bigbufptr_recbuf(void);\r
-\r
-// emulator functions\r
-void emlClearMem(void);\r
-void emlSetMem(uint8_t *data, int blockNum, int blocksCount);\r
-void emlGetMem(uint8_t *data, int blockNum, int blocksCount);\r
-void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount);\r
-uint64_t emlGetKey(int sectorNum, int keyType);\r
-int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum);\r
+void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, int len, uint32_t *par);
+uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data);
+
+// memory management
+uint8_t* mifare_get_bigbufptr(void);
+uint8_t* eml_get_bigbufptr_sendbuf(void);
+uint8_t* eml_get_bigbufptr_recbuf(void);
+
+// emulator functions
+void emlClearMem(void);
+void emlSetMem(uint8_t *data, int blockNum, int blocksCount);
+void emlGetMem(uint8_t *data, int blockNum, int blocksCount);
+void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount);
+uint64_t emlGetKey(int sectorNum, int keyType);
+int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum);
 int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum);
 int emlCheckValBl(int blockNum);
 
index d99e48d81db06583d78dcde71e67bd22b5d03044..55e7c6e477f9483dd58c6d3698a02c2f61bf66e2 100644 (file)
@@ -153,9 +153,16 @@ typedef struct {
 #define CMD_MIFAREU_WRITEBL_COMPAT                                       0x0722
 #define CMD_MIFAREU_WRITEBL                                              0x0723
 #define CMD_MIFARE_CHKKEYS                                                0x0623
-
 #define CMD_MIFARE_SNIFFER                                                0x0630
 
+//ultralightC
+#define CMD_MIFAREUC_AUTH1                                                0x0724
+#define CMD_MIFAREUC_AUTH2                                                0x0725
+#define CMD_MIFAREUC_READCARD                                             0x0726
+//desfire
+#define CMD_MIFARE_DES_AUTH1                                              0x0730
+#define CMD_MIFARE_DES_AUTH2                                              0x0731
+
 #define CMD_UNKNOWN                                                       0xFFFF
 
 
Impressum, Datenschutz