Merge pull request #63 from micolous/log-nonce

[proxmark3-svn] / armsrc / mifareutil.c

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 8ef364c259f0d16216834a87dac9bef073be1e92..ca2cbeb7d924a3a9d7a5d75d08392b81eaad5f34 100644 (file)
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -18,6 +18,7 @@
 #include "iso14443a.h"\r
 #include "crapto1.h"\r
 #include "mifareutil.h"\r
 #include "iso14443a.h"\r
 #include "crapto1.h"\r
 #include "mifareutil.h"\r

+#include "parity.h"\r

 #include "des.h"\r
 \r
 int MF_DBGLEVEL = MF_DBG_ALL;\r
 #include "des.h"\r
 \r
 int MF_DBGLEVEL = MF_DBG_ALL;\r


@@ -31,10 +32,10 @@ void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len){
                for (i = 0; i < len; i++)\r
                        data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];\r
        } else {\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
+               bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data[0], 0)) << 0;\r
+               bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data[0], 1)) << 1;\r
+               bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data[0], 2)) << 2;\r
+               bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data[0], 3)) << 3;\r

                data[0] = bt;\r
        }\r
        return;\r
                data[0] = bt;\r
        }\r
        return;\r


@@ -48,62 +49,53 @@ 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) ^ oddparity(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

-       return;\r

 }\r
 \r
 uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {\r
        uint8_t bt = 0;\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
+       bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 0)) << 0;\r
+       bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 1)) << 1;\r
+       bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 2)) << 2;\r
+       bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, 3)) << 3;\r

        return bt;\r
 }\r
 \r
 // send X byte basic commands\r
        return bt;\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
        uint8_t dcmd[data_size+3];\r

-       dcmd[0] = cmd;\r
-       memcpy(dcmd+1,data,data_size);\r
+    dcmd[0] = cmd;\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
-               //return 0;\r
-       }\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
        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], ecmd[4];\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 par[1];                 // 1 Byte parity is enough here\r
-       dcmd[0] = cmd;\r
-       dcmd[1] = data;\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

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

-       \r

        memcpy(ecmd, dcmd, sizeof(dcmd));\r
        \r
        if (crypted) {\r
                par[0] = 0;\r
        memcpy(ecmd, dcmd, sizeof(dcmd));\r
        \r
        if (crypted) {\r
                par[0] = 0;\r

-               for (pos = 0; pos < 4; pos++)\r
-               {\r
+               for (pos = 0; pos < 4; pos++) {\r

                        ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];\r
                        ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];\r

-                       par[0] |= (((filter(pcs->odd) ^ oddparity(dcmd[pos])) & 0x01) << (7-pos));\r
+                       par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7-pos));\r

                }       \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


@@ -115,53 +107,44 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
        if (crypted == CRYPT_ALL) {\r
                if (len == 1) {\r
                        res = 0;\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
+                       res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], 0)) << 0;\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

                } else {\r
                        for (pos = 0; pos < len; pos++)\r
                } else {\r
                        for (pos = 0; pos < len; pos++)\r

-                       {\r

                                answer[pos] = crypto1_byte(pcs, 0x00, 0) ^ answer[pos];\r
                                answer[pos] = crypto1_byte(pcs, 0x00, 0) ^ answer[pos];\r

-                       }\r

                }\r
        }\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
        int len;        \r
        uint32_t pos;\r

-       uint8_t tmp4[4];\r

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

-       byte_t nr[4];\r
+\r
+       // "random" reader nonce:\r
+       //byte_t nr[4] = {0x55, 0x41, 0x49, 0x92};\r
+       byte_t nr[4] = {0x01, 0x01, 0x01, 0x01};\r
+       \r

        uint32_t nt, ntpp; // Supplied tag nonce\r
        \r
        uint8_t mf_nr_ar[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };\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[MAX_MIFARE_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
+       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0x00};\r
+       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0x00};\r

        \r
        // Transmit MIFARE_CLASSIC_AUTH\r
        len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer, receivedAnswerPar, timing);\r
        if (MF_DBGLEVEL >= 4)   Dbprintf("rand tag nonce len: %x", len);  \r
        if (len != 4) return 1;\r
        \r
        \r
        // Transmit MIFARE_CLASSIC_AUTH\r
        len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer, receivedAnswerPar, timing);\r
        if (MF_DBGLEVEL >= 4)   Dbprintf("rand tag nonce len: %x", len);  \r
        if (len != 4) return 1;\r
        \r

-       // "random" reader nonce:\r
-       nr[0] = 0x55;\r
-       nr[1] = 0x41;\r
-       nr[2] = 0x49;\r
-       nr[3] = 0x92; \r
-       \r

        // Save the tag nonce (nt)\r
        nt = bytes_to_num(receivedAnswer, 4);\r
 \r
        // Save the tag nonce (nt)\r
        nt = bytes_to_num(receivedAnswer, 4);\r
 \r


@@ -190,21 +173,19 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 \r
        // Generate (encrypted) nr+parity by loading it into the cipher (Nr)\r
        par[0] = 0;\r
 \r
        // Generate (encrypted) nr+parity by loading it into the cipher (Nr)\r
        par[0] = 0;\r

-       for (pos = 0; pos < 4; pos++)\r
-       {\r
+       for (pos = 0; pos < 4; pos++) {\r

                mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];\r
                mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];\r

-               par[0] |= (((filter(pcs->odd) ^ oddparity(nr[pos])) & 0x01) << (7-pos));\r
+               par[0] |= (((filter(pcs->odd) ^ oddparity8(nr[pos])) & 0x01) << (7-pos));\r

        }       \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
 \r
        //  ar+parity\r

-       for (pos = 4; pos < 8; pos++)\r
-       {\r
+       for (pos = 4; pos < 8; pos++) {\r

                nt = prng_successor(nt,8);\r
                mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);\r
                nt = prng_successor(nt,8);\r
                mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);\r

-               par[0] |= (((filter(pcs->odd) ^ oddparity(nt & 0xff)) & 0x01) << (7-pos));\r
+               par[0] |= (((filter(pcs->odd) ^ oddparity8(nt & 0xff)) & 0x01) << (7-pos));\r

        }       \r
                \r
        // Transmit reader nonce and reader answer\r
        }       \r
                \r
        // Transmit reader nonce and reader answer\r


@@ -212,34 +193,28 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 \r
        // Receive 4 byte tag answer\r
        len = ReaderReceive(receivedAnswer, receivedAnswerPar);\r
 \r
        // Receive 4 byte tag answer\r
        len = ReaderReceive(receivedAnswer, receivedAnswerPar);\r

-       if (!len)\r
-       {\r
+       if (!len) {\r

                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
-       memcpy(tmp4, receivedAnswer, 4);\r
+\r

        ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0,0);\r
        ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0,0);\r

-       \r
-       if (ntpp != bytes_to_num(tmp4, 4)) {\r
+\r
+       if (ntpp != bytes_to_num(receivedAnswer, 4)) {\r

                if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Error card response.");\r
                return 3;\r
        }\r
                if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Error card response.");\r
                return 3;\r
        }\r

-\r

        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];\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
        \r

-       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\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


@@ -263,16 +238,17 @@ 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];\r
-       uint8_t respPar[1];\r
-       uint8_t key[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 key[4] = {0x00, 0x00, 0x00, 0x00};\r

        memcpy(key, keybytes, 4);\r
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r
                Dbprintf("EV1 Auth : %02x%02x%02x%02x", key[0], key[1], key[2], key[3]);\r
        memcpy(key, keybytes, 4);\r
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r
                Dbprintf("EV1 Auth : %02x%02x%02x%02x", key[0], key[1], key[2], key[3]);\r

+       \r

        len = mifare_sendcmd(0x1B, key, sizeof(key), resp, respPar, NULL);\r
        len = mifare_sendcmd(0x1B, key, sizeof(key), resp, respPar, NULL);\r

-       //len = mifare_sendcmd_short_mfuev1auth(NULL, 0, 0x1B, key, resp, respPar, NULL);\r
+\r

        if (len != 4) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x %u", resp[0], len);\r
                return 0;\r
        if (len != 4) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x %u", resp[0], len);\r
                return 0;\r


@@ -288,7 +264,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


@@ -297,7 +272,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


@@ -333,7 +308,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


@@ -371,14 +346,12 @@ 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];\r
-       uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\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
        \r

-\r

        len = mifare_sendcmd_short(NULL, 1, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r
        if (len == 1) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
        len = mifare_sendcmd_short(NULL, 1, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r
        if (len == 1) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r


@@ -400,17 +373,16 @@ 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, i;        \r
-       uint32_t pos;\r
-       uint8_t par[3] = {0};           // enough for 18 Bytes to send\r
-       byte_t res;\r
+       uint16_t len = 0;       \r
+       uint32_t pos = 0;\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
        \r
        uint8_t d_block[18], d_block_enc[18];\r

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

        \r
        // command MIFARE_CLASSIC_WRITEBLOCK\r
        len = mifare_sendcmd_short(pcs, 1, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r
        \r
        // command MIFARE_CLASSIC_WRITEBLOCK\r
        len = mifare_sendcmd_short(pcs, 1, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r


@@ -424,10 +396,9 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
        AppendCrc14443a(d_block, 16);\r
        \r
        // crypto\r
        AppendCrc14443a(d_block, 16);\r
        \r
        // crypto\r

-       for (pos = 0; pos < 18; pos++)\r
-       {\r
+       for (pos = 0; pos < 18; pos++) {\r

                d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];\r
                d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];\r

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

        }       \r
 \r
        ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);\r
        }       \r
 \r
        ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);\r


@@ -436,36 +407,36 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
        len = ReaderReceive(receivedAnswer, receivedAnswerPar); \r
 \r
        res = 0;\r
        len = ReaderReceive(receivedAnswer, receivedAnswerPar); \r
 \r
        res = 0;\r

-       for (i = 0; i < 4; i++)\r
-               res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], i)) << i;\r
+       res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 0)) << 0;\r
+       res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 1)) << 1;\r
+       res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 2)) << 2;\r
+       res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], 3)) << 3;\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
        if ((len != 1) || (res != 0x0A)) {\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
        uint16_t len;\r

-       uint8_t par[3] = {0};  // enough for 18 parity bits\r
+    uint8_t par[3] = {0};  // enough for 18 parity bits\r

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

-       len = mifare_sendcmd_short(NULL, true, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r
+    len = mifare_sendcmd_short(NULL, true, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r

 \r
 \r

-       if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK\r
+    if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK\r

                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
                        Dbprintf("Cmd Addr Error: %02x", receivedAnswer[0]);\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
                        Dbprintf("Cmd Addr Error: %02x", receivedAnswer[0]);\r

-               return 1;\r
-       }\r
+        return 1;\r
+    }\r

 \r
        memcpy(d_block, blockData, 16);\r
 \r
        memcpy(d_block, blockData, 16);\r

-       AppendCrc14443a(d_block, 16);\r
+    AppendCrc14443a(d_block, 16);\r

 \r
        ReaderTransmitPar(d_block, sizeof(d_block), par, NULL);\r
 \r
 \r
        ReaderTransmitPar(d_block, sizeof(d_block), par, NULL);\r
 \r


@@ -474,60 +445,45 @@ int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData)
        if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
                        Dbprintf("Cmd Data Error: %02x %d", receivedAnswer[0],len);\r
        if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
                        Dbprintf("Cmd Data Error: %02x %d", receivedAnswer[0],len);\r

-               return 2;\r
+        return 2;\r

        }\r
        }\r

-       return 0;\r
+    return 0;\r

 }\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
-       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\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
 \r

-       // command MIFARE_CLASSIC_WRITEBLOCK\r
-       d_block[0]= blockNo;\r
-       memcpy(d_block+1,blockData,4);\r
-       //AppendCrc14443a(d_block, 6);\r
+    // command MIFARE_CLASSIC_WRITEBLOCK\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
 \r

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

                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
                        Dbprintf("Cmd Send Error: %02x %d", receivedAnswer[0],len);\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
                        Dbprintf("Cmd Send Error: %02x %d", receivedAnswer[0],len);\r

-               return 1;\r
-       }\r
-       return 0;\r
+        return 1;\r
+    }\r
+    return 0;\r

 }\r
 }\r

-\r
-int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) \r
-{\r
-       uint16_t len;   \r
-       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
-\r
-       len = mifare_sendcmd_short(pcs, pcs == NULL ? false:true, 0x50, 0x00, receivedAnswer, receivedAnswerPar, NULL);\r
-       if (len != 0) {\r
-               if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
-                       Dbprintf("halt error. response len: %x", len);  \r
-               return 1;\r
-       }\r
-\r
+int mifare_classic_halt_ex(struct Crypto1State *pcs) {\r
+       uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};\r
+       mifare_sendcmd_short(pcs, (pcs == NULL) ? CRYPT_NONE : CRYPT_ALL, 0x50, 0x00, receivedAnswer, NULL, NULL);\r

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

+int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) {\r
+       return mifare_classic_halt_ex(pcs);\r
+}\r

 \r
 \r

-int mifare_ultra_halt()\r
-{\r
-       uint16_t len;\r
-       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\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


@@ -536,16 +492,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
-       else\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


@@ -553,11 +504,14 @@ uint8_t FirstBlockOfSector(uint8_t sectorNo)
                \r
 }\r
 \r
                \r
 }\r
 \r

-\r

 // work with emulator memory\r
 void emlSetMem(uint8_t *data, int blockNum, int blocksCount) {\r
 // work with emulator memory\r
 void emlSetMem(uint8_t *data, int blockNum, int blocksCount) {\r

+       emlSetMem_xt(data, blockNum, blocksCount, 16);\r
+}\r
+\r
+void emlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {\r

        uint8_t* emCARD = BigBuf_get_EM_addr();\r
        uint8_t* emCARD = BigBuf_get_EM_addr();\r

-       memcpy(emCARD + blockNum * 16, data, blocksCount * 16);\r
+       memcpy(emCARD + blockNum * blockBtWidth, data, blocksCount * blockBtWidth);\r

 }\r
 \r
 void emlGetMem(uint8_t *data, int blockNum, int blocksCount) {\r
 }\r
 \r
 void emlGetMem(uint8_t *data, int blockNum, int blocksCount) {\r


@@ -589,9 +543,8 @@ int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {
        uint8_t* emCARD = BigBuf_get_EM_addr();\r
        uint8_t* data = emCARD + blockNum * 16;\r
        \r
        uint8_t* emCARD = BigBuf_get_EM_addr();\r
        uint8_t* data = emCARD + blockNum * 16;\r
        \r

-       if (emlCheckValBl(blockNum)) {\r
+       if (emlCheckValBl(blockNum))\r

                return 1;\r
                return 1;\r

-       }\r

        \r
        memcpy(blReg, data, 4);\r
        *blBlock = data[12];\r
        \r
        memcpy(blReg, data, 4);\r
        *blBlock = data[12];\r


@@ -616,7 +569,7 @@ int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {
 }\r
 \r
 uint64_t emlGetKey(int sectorNum, int keyType) {\r
 }\r
 \r
 uint64_t emlGetKey(int sectorNum, int keyType) {\r

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

        uint8_t* emCARD = BigBuf_get_EM_addr();\r
        \r
        memcpy(key, emCARD + 16 * (FirstBlockOfSector(sectorNum) + NumBlocksPerSector(sectorNum) - 1) + keyType * 10, 6);\r
        uint8_t* emCARD = BigBuf_get_EM_addr();\r
        \r
        memcpy(key, emCARD + 16 * (FirstBlockOfSector(sectorNum) + NumBlocksPerSector(sectorNum) - 1) + keyType * 10, 6);\r


@@ -633,9 +586,8 @@ void emlClearMem(void) {
        memset(emCARD, 0, CARD_MEMORY_SIZE);\r
        \r
        // fill sectors trailer data\r
        memset(emCARD, 0, CARD_MEMORY_SIZE);\r
        \r
        // fill sectors trailer data\r

-       for(b = 3; b < 256; b<127?(b+=4):(b+=16)) {\r
+       for(b = 3; b < 256; b<127?(b+=4):(b+=16))\r

                emlSetMem((uint8_t *)trailer, b , 1);\r
                emlSetMem((uint8_t *)trailer, b , 1);\r

-       }       \r

 \r
        // uid\r
        emlSetMem((uint8_t *)uid, 0, 1);\r
 \r
        // uid\r
        emlSetMem((uint8_t *)uid, 0, 1);\r


@@ -646,9 +598,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


@@ -683,8 +633,8 @@ int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData){
        int len;\r
        // load key, keynumber\r
        uint8_t data[2]={0x0a, 0x00};\r
        int len;\r
        // load key, keynumber\r
        uint8_t data[2]={0x0a, 0x00};\r

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

        \r
        len = mifare_sendcmd_special(NULL, 1, 0x02, data, receivedAnswer,receivedAnswerPar,NULL);\r
        if (len == 1) {\r
        \r
        len = mifare_sendcmd_special(NULL, 1, 0x02, data, receivedAnswer,receivedAnswerPar,NULL);\r
        if (len == 1) {\r


@@ -713,8 +663,8 @@ int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){
        data[0] = 0xAF;\r
        memcpy(data+1,key,16);\r
        \r
        data[0] = 0xAF;\r
        memcpy(data+1,key,16);\r
        \r

-       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
+       uint8_t receivedAnswer[MAX_FRAME_SIZE] = {0x00};\r
+       uint8_t receivedAnswerPar[MAX_PARITY_SIZE] = {0x00};\r

        \r
        len = mifare_sendcmd_special2(NULL, 1, 0x03, data, receivedAnswer, receivedAnswerPar ,NULL);\r
        \r
        \r
        len = mifare_sendcmd_special2(NULL, 1, 0x03, data, receivedAnswer, receivedAnswerPar ,NULL);\r
        \r