]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/mifareutil.c
Added the changes to armsrc for milfare ultralight C and Desfire commands
[proxmark3-svn] / armsrc / mifareutil.c
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
Impressum, Datenschutz