CHG: moved to header file

[proxmark3-svn] / armsrc / mifareutil.c

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 0a057d6541250b1fd38d9209255afc9715d7313e..5dfeeab0a76eae5cb0fd374d40ce9dfe8f5c1e6b 100644 (file)
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -9,17 +9,7 @@
 // Work with mifare cards.\r
 //-----------------------------------------------------------------------------\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
 #include "mifareutil.h"\r

-#include "parity.h"\r
-#include "des.h"\r

 \r
 int MF_DBGLEVEL = MF_DBG_ALL;\r
 \r
 \r
 int MF_DBGLEVEL = MF_DBG_ALL;\r
 \r


@@ -49,9 +39,9 @@ void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, u
        for (i = 0; i < len; i++) {\r
                bt = data[i];\r
                data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];\r
        for (i = 0; i < len; i++) {\r
                bt = data[i];\r
                data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];\r

-               if ((i&0x0007) == 0) \r
-                       par[i>>3] = 0;\r
-               par[i>>3] |= (((filter(pcs->odd) ^ oddparity8(bt)) & 0x01)<<(7-(i&0x0007)));\r
+               if ( ( i & 0x0007 ) == 0) \r
+                       par[ i >> 3 ] = 0;\r
+               par[ i >> 3 ] |= (((filter(pcs->odd) ^ oddparity8(bt)) & 0x01)<<(7-(i&0x0007)));\r

        }       \r
 }\r
 \r
        }       \r
 }\r
 \r


@@ -65,32 +55,28 @@ uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {
 }\r
 \r
 // send X byte basic commands\r
 }\r
 \r
 // send X byte basic commands\r

-int mifare_sendcmd(uint8_t cmd, uint8_t* data, uint8_t data_size, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing)\r
-{\r
+int mifare_sendcmd(uint8_t cmd, uint8_t* data, uint8_t data_size, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing) {\r

        uint8_t dcmd[data_size+3];\r
     dcmd[0] = cmd;\r
        uint8_t dcmd[data_size+3];\r
     dcmd[0] = cmd;\r

-       memcpy(dcmd+1,data,data_size);\r
+       memcpy(dcmd+1, data, data_size);\r

        AppendCrc14443a(dcmd, data_size+1);\r
        ReaderTransmit(dcmd, sizeof(dcmd), timing);\r
        int len = ReaderReceive(answer, answer_parity);\r
        if(!len) {\r
        AppendCrc14443a(dcmd, data_size+1);\r
        ReaderTransmit(dcmd, sizeof(dcmd), timing);\r
        int len = ReaderReceive(answer, answer_parity);\r
        if(!len) {\r

-               if (MF_DBGLEVEL >= MF_DBG_ERROR)   Dbprintf("%02X Cmd failed. Card timeout.", cmd);\r
-                       len = ReaderReceive(answer,answer_parity);\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
+                       Dbprintf("%02X Cmd failed. Card timeout.", cmd);\r
+               len = ReaderReceive(answer,answer_parity);\r

     }\r
        return len;\r
 }\r
 \r
 // send 2 byte commands\r
     }\r
        return len;\r
 }\r
 \r
 // send 2 byte commands\r

-int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)\r
-{\r
-       uint8_t dcmd[4] = {0x00};\r
-       uint8_t ecmd[4] = {0x00};\r
+int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing) {\r

        uint16_t pos, res;\r
        uint16_t pos, res;\r

+       uint8_t dcmd[4] = {cmd, data, 0x00, 0x00};\r
+       uint8_t ecmd[4] = {0x00, 0x00, 0x00, 0x00};\r

        uint8_t par[1] = {0x00};                        // 1 Byte parity is enough here\r
        uint8_t par[1] = {0x00};                        // 1 Byte parity is enough here\r

-       dcmd[0] = cmd;\r
-       dcmd[1] = data;\r

        AppendCrc14443a(dcmd, 2);\r
        AppendCrc14443a(dcmd, 2);\r

-       \r

        memcpy(ecmd, dcmd, sizeof(dcmd));\r
        \r
        if (crypted) {\r
        memcpy(ecmd, dcmd, sizeof(dcmd));\r
        \r
        if (crypted) {\r


@@ -99,9 +85,7 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
                        ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];\r
                        par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7-pos));\r
                }       \r
                        ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];\r
                        par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7-pos));\r
                }       \r

-\r

                ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);\r
                ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);\r

-\r

        } else {\r
                ReaderTransmit(dcmd, sizeof(dcmd), timing);\r
        }\r
        } else {\r
                ReaderTransmit(dcmd, sizeof(dcmd), timing);\r
        }\r


@@ -117,26 +101,21 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
                        res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 1)) << 1;\r
                        res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 2)) << 2;\r
                        res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 3)) << 3;\r
                        res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 1)) << 1;\r
                        res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 2)) << 2;\r
                        res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 3)) << 3;\r

-                       answer[0] = res;\r
-                       \r
+                       answer[0] = res;                        \r

                } else {\r
                        for (pos = 0; pos < len; pos++)\r
                                answer[pos] = crypto1_byte(pcs, 0x00, 0) ^ answer[pos];\r
                }\r
        }\r
                } else {\r
                        for (pos = 0; pos < len; pos++)\r
                                answer[pos] = crypto1_byte(pcs, 0x00, 0) ^ answer[pos];\r
                }\r
        }\r

-       \r

        return len;\r
 }\r
 \r
 // mifare classic commands\r
        return len;\r
 }\r
 \r
 // mifare classic commands\r

-int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested) \r
-{\r
+int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested) {\r

        return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL);\r
 }\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, uint8_t isNested, uint32_t *ntptr, uint32_t *timing) \r
-{\r
-       // variables\r
+int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing) {\r

        int len;        \r
        uint32_t pos;\r
        uint8_t par[1] = {0x00};\r
        int len;        \r
        uint32_t pos;\r
        uint8_t par[1] = {0x00};\r


@@ -190,7 +169,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
        }       \r
                \r
        // Skip 32 bits in pseudo random generator\r
        }       \r
                \r
        // Skip 32 bits in pseudo random generator\r

-       nt = prng_successor(nt,32);\r
+       nt = prng_successor(nt, 32);\r

 \r
        //  ar+parity\r
        for (pos = 4; pos < 8; pos++) {\r
 \r
        //  ar+parity\r
        for (pos = 4; pos < 8; pos++) {\r


@@ -208,7 +187,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
                if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Card timeout.");\r
                return 2;\r
        }\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Card timeout.");\r
                return 2;\r
        }\r

-       \r
+\r

        ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0,0);\r
 \r
        if (ntpp != bytes_to_num(receivedAnswer, 4)) {\r
        ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0,0);\r
 \r
        if (ntpp != bytes_to_num(receivedAnswer, 4)) {\r


@@ -218,17 +197,14 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
        return 0;\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 mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) {\r
+\r

        int len;        \r
        int len;        \r

-       uint8_t bt[2] = {0x00};\r
-       \r
+       uint8_t bt[2] = {0x00, 0x00};   \r

        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};\r
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};\r
        \r
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};\r
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};\r
        \r

-       // command MIFARE_CLASSIC_READBLOCK\r
-       len = mifare_sendcmd_short(pcs, 1, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r
+       len = mifare_sendcmd_short(pcs, 1, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r

        if (len == 1) {\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  \r
                return 1;\r
        if (len == 1) {\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  \r
                return 1;\r


@@ -252,10 +228,10 @@ int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blo
 // mifare ultralight commands\r
 int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){\r
 \r
 // mifare ultralight commands\r
 int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){\r
 \r

-       uint16_t len;\r
-       uint8_t resp[4] = {0x00};\r
+       uint16_t len = 0;\r
+       uint8_t resp[4] = {0x00, 0x00, 0x00, 0x00};\r

        uint8_t respPar[1] = {0x00};\r
        uint8_t respPar[1] = {0x00};\r

-       uint8_t key[4] = {0x00};\r
+       uint8_t key[4] = {0x00, 0x00, 0x00, 0x00};\r

        memcpy(key, keybytes, 4);\r
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r
        memcpy(key, keybytes, 4);\r
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r


@@ -278,7 +254,6 @@ int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){
 int mifare_ultra_auth(uint8_t *keybytes){\r
 \r
        /// 3des2k\r
 int mifare_ultra_auth(uint8_t *keybytes){\r
 \r
        /// 3des2k\r

-\r

        uint8_t random_a[8] = {1,1,1,1,1,1,1,1};\r
        uint8_t random_b[8] = {0x00};\r
        uint8_t enc_random_b[8] = {0x00};\r
        uint8_t random_a[8] = {1,1,1,1,1,1,1,1};\r
        uint8_t random_b[8] = {0x00};\r
        uint8_t enc_random_b[8] = {0x00};\r


@@ -287,7 +262,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
        uint8_t key[16] = {0x00};\r
        memcpy(key, keybytes, 16);\r
 \r
        uint8_t key[16] = {0x00};\r
        memcpy(key, keybytes, 16);\r
 \r

-       uint16_t len;\r
+       uint16_t len = 0;\r

        uint8_t resp[19] = {0x00};\r
        uint8_t respPar[3] = {0,0,0};\r
 \r
        uint8_t resp[19] = {0x00};\r
        uint8_t respPar[3] = {0,0,0};\r
 \r


@@ -323,7 +298,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
 \r
        // encrypt    out, in, length, key, iv\r
        tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);\r
 \r
        // encrypt    out, in, length, key, iv\r
        tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);\r

-       //len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, resp, respPar, NULL);\r
+\r

        len = mifare_sendcmd(0xAF, rnd_ab, sizeof(rnd_ab), resp, respPar, NULL);\r
        if (len != 11) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);\r
        len = mifare_sendcmd(0xAF, rnd_ab, sizeof(rnd_ab), resp, respPar, NULL);\r
        if (len != 11) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);\r


@@ -361,10 +336,9 @@ int mifare_ultra_auth(uint8_t *keybytes){
        return 1;\r
 }\r
 \r
        return 1;\r
 }\r
 \r

-int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData)\r
-{\r
-       uint16_t len;\r
-       uint8_t bt[2] = {0x00};\r
+int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData) {\r
+       uint16_t len = 0;\r
+       uint8_t bt[2] = {0x00, 0x00};\r

        uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};\r
        uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};\r
        \r
        uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};\r
        uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};\r
        \r


@@ -389,12 +363,11 @@ int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData)
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r

-int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) \r
-{\r
+int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) {\r

        // variables\r
        // variables\r

-       uint16_t len;   \r
+       uint16_t len = 0;       \r

        uint32_t pos = 0;\r
        uint32_t pos = 0;\r

-       uint8_t par[3] = {0x00};                // enough for 18 Bytes to send\r
+       uint8_t par[3] = {0x00, 0x00, 0x00}; // enough for 18 Bytes to send\r

        byte_t res = 0;\r
        \r
        uint8_t d_block[18], d_block_enc[18];\r
        byte_t res = 0;\r
        \r
        uint8_t d_block[18], d_block_enc[18];\r


@@ -433,13 +406,11 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
                if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd send data2 Error: %02x", res);  \r
                return 2;\r
        }\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd send data2 Error: %02x", res);  \r
                return 2;\r
        }\r

-       \r

        return 0;\r
 }\r
 \r
 /* // command not needed, but left for future testing\r
        return 0;\r
 }\r
 \r
 /* // command not needed, but left for future testing\r

-int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData) \r
-{\r
+int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData) {\r

        uint16_t len;\r
     uint8_t par[3] = {0};  // enough for 18 parity bits\r
        uint8_t d_block[18] = {0x00};\r
        uint16_t len;\r
     uint8_t par[3] = {0};  // enough for 18 parity bits\r
        uint8_t d_block[18] = {0x00};\r


@@ -470,19 +441,16 @@ int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData)
 }\r
 */\r
 \r
 }\r
 */\r
 \r

-int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)\r
-{\r
-    uint16_t len;\r
-       uint8_t d_block[5] = {0x00};\r
+int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData) {\r
+    uint16_t len = 0;\r
+       uint8_t block[5] = {blockNo, 0x00, 0x00, 0x00, 0x00 };\r

        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};\r
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};\r
 \r
     // command MIFARE_CLASSIC_WRITEBLOCK\r
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};\r
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};\r
 \r
     // command MIFARE_CLASSIC_WRITEBLOCK\r

-       d_block[0]= blockNo;\r
-       memcpy(d_block+1,blockData,4);\r
-       //AppendCrc14443a(d_block, 6);\r
+       memcpy(block+1, blockData, 4);\r

 \r
 \r

-       len = mifare_sendcmd(0xA2, d_block, sizeof(d_block), receivedAnswer, receivedAnswerPar, NULL);\r
+       len = mifare_sendcmd( MIFARE_ULC_WRITE, block, sizeof(block), receivedAnswer, receivedAnswerPar, NULL);\r

 \r
     if (receivedAnswer[0] != 0x0A) {   //  0x0a - ACK\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
 \r
     if (receivedAnswer[0] != 0x0A) {   //  0x0a - ACK\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r


@@ -492,13 +460,10 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)
     return 0;\r
 }\r
 int mifare_classic_halt_ex(struct Crypto1State *pcs) {\r
     return 0;\r
 }\r
 int mifare_classic_halt_ex(struct Crypto1State *pcs) {\r

-       uint16_t len;   \r
-       uint8_t receivedAnswer[4] = {0x00};\r
-       uint8_t receivedAnswerPar[4] = {0x00};\r
-\r
-       len = mifare_sendcmd_short(pcs, pcs == NULL ? false:true, 0x50, 0x00, receivedAnswer, receivedAnswerPar, NULL);\r
+       uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};\r
+       uint16_t len = mifare_sendcmd_short(pcs, (pcs == NULL) ? CRYPT_NONE : CRYPT_ALL, 0x50, 0x00, receivedAnswer, NULL, NULL);\r

        if (len != 0) {\r
        if (len != 0) {\r

-               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("halt error. response len: %x", len);  \r
+               if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("halt warning. response len: %x", len);\r

                return 1;\r
        }\r
        return 0;\r
                return 1;\r
        }\r
        return 0;\r


@@ -507,16 +472,12 @@ int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) {
        return mifare_classic_halt_ex(pcs);\r
 }\r
 \r
        return mifare_classic_halt_ex(pcs);\r
 }\r
 \r

-int mifare_ultra_halt()\r
-{\r
-       uint16_t len;\r
-       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};\r
-       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};\r
-    \r
-       len = mifare_sendcmd_short(NULL, true, 0x50, 0x00, receivedAnswer, receivedAnswerPar, NULL);\r
+int mifare_ultra_halt() {\r
+       uint16_t len = 0;\r
+       uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};\r
+       len = mifare_sendcmd_short(NULL, CRYPT_NONE, 0x50, 0x00, receivedAnswer, NULL, NULL);\r

        if (len != 0) {\r
        if (len != 0) {\r

-               if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
-                       Dbprintf("halt error. response len: %x", len);\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("halt error. response len: %x", len);\r

                return 1;\r
        }\r
        return 0;\r
                return 1;\r
        }\r
        return 0;\r


@@ -525,15 +486,11 @@ int mifare_ultra_halt()
 \r
 // Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards),\r
 // plus evtl. 8 sectors with 16 blocks each (4k cards)\r
 \r
 // Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards),\r
 // plus evtl. 8 sectors with 16 blocks each (4k cards)\r

-uint8_t NumBlocksPerSector(uint8_t sectorNo) \r
-{\r
-       if (sectorNo < 32) \r
-               return 4;\r
-       return 16;\r
+uint8_t NumBlocksPerSector(uint8_t sectorNo) {\r
+       return (sectorNo < 32) ? 4 : 16;\r

 }\r
 \r
 }\r
 \r

-uint8_t FirstBlockOfSector(uint8_t sectorNo) \r
-{\r
+uint8_t FirstBlockOfSector(uint8_t sectorNo) {\r

        if (sectorNo < 32)\r
                return sectorNo * 4;\r
        else\r
        if (sectorNo < 32)\r
                return sectorNo * 4;\r
        else\r


@@ -635,9 +592,7 @@ void emlClearMem(void) {
 // Mifare desfire commands\r
 int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing)\r
 {\r
 // Mifare desfire commands\r
 int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing)\r
 {\r

-    uint8_t dcmd[5] = {0x00};\r
-    dcmd[0] = cmd;\r
-    memcpy(dcmd+1,data,2);\r
+    uint8_t dcmd[5] = {cmd, data[0], data[1], 0x00, 0x00};\r

        AppendCrc14443a(dcmd, 3);\r
        \r
        ReaderTransmit(dcmd, sizeof(dcmd), NULL);\r
        AppendCrc14443a(dcmd, 3);\r
        \r
        ReaderTransmit(dcmd, sizeof(dcmd), NULL);\r