]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/mifareutil.c
split lf indala[cmd] to lf indala [cmd]
[proxmark3-svn] / armsrc / mifareutil.c
index cc54b74022ae32fc1ed8a9faaa0800c06aad69d2..48fcd57a3691aa983bef9616dc89fe3dd52f4fff 100644 (file)
@@ -9,6 +9,7 @@
 // Work with mifare cards.\r
 //-----------------------------------------------------------------------------\r
 \r
+#include "mifareutil.h"\r
 #include "proxmark3.h"\r
 #include "apps.h"\r
 #include "util.h"\r
@@ -16,8 +17,8 @@
 \r
 #include "iso14443crc.h"\r
 #include "iso14443a.h"\r
-#include "crapto1.h"\r
-#include "mifareutil.h"\r
+#include "crapto1/crapto1.h"\r
+#include "des.h"\r
 \r
 int MF_DBGLEVEL = MF_DBG_ALL;\r
 \r
@@ -64,53 +65,25 @@ uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {
        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, uint8_t *answer_parity, uint32_t *timing)\r
-{\r
-       return mifare_sendcmd_shortex(pcs, crypted, cmd, data, answer, answer_parity, timing);\r
-}\r
-\r
-int mifare_sendcmd_short_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing)\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
-       uint8_t dcmd[8];\r
-    dcmd[0] = cmd;\r
-    dcmd[1] = data[0];\r
-       dcmd[2] = data[1];\r
-       dcmd[3] = data[2];\r
-       dcmd[4] = data[3];\r
-       dcmd[5] = data[4];\r
-       AppendCrc14443a(dcmd, 6);\r
-       ReaderTransmit(dcmd, sizeof(dcmd), NULL);\r
-       int len = ReaderReceive(answer, answer_parity);\r
-       if(!len) {\r
-                if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Card timeout.");\r
-                return 2;\r
-    }\r
-       return len;\r
-}\r
-\r
-int mifare_sendcmd_short_mfucauth(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[19];\r
-       int len; \r
-    dcmd[0] = cmd;\r
-    memcpy(dcmd+1,data,16);\r
-       AppendCrc14443a(dcmd, 17);\r
-       \r
+       uint8_t dcmd[data_size+3];\r
+       dcmd[0] = cmd;\r
+       memcpy(dcmd+1,data,data_size);\r
+       AppendCrc14443a(dcmd, data_size+1);\r
        ReaderTransmit(dcmd, sizeof(dcmd), timing);\r
-       len = ReaderReceive(answer, answer_parity);\r
+       int len = ReaderReceive(answer, answer_parity);\r
        if(!len) {\r
-        if (MF_DBGLEVEL >= MF_DBG_ERROR)   Dbprintf("Authentication failed. Card timeout.");\r
-        len = ReaderReceive(answer,answer_parity);\r
-    }\r
-    if(len==1) {\r
-               if (MF_DBGLEVEL >= MF_DBG_ERROR)   Dbprintf("NAK - Authentication failed.");\r
-               return 1;\r
-        }\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
        return len;\r
 }\r
 \r
-int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)\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
        uint16_t pos, res;\r
@@ -288,68 +261,114 @@ int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blo
 }\r
 \r
 // mifare ultralight commands\r
-int mifare_ul_ev1_auth(uint8_t *key, uint8_t *pack){\r
+int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){\r
 \r
        uint16_t len;\r
-       uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r
-       \r
-       len = mifare_sendcmd_short_mfucauth(NULL, 0, 0x1B, key, receivedAnswer, receivedAnswerPar, NULL);\r
+       uint8_t resp[4];\r
+       uint8_t respPar[1];\r
+       uint8_t key[4] = {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
+       len = mifare_sendcmd(0x1B, key, sizeof(key), resp, respPar, NULL);\r
+       //len = mifare_sendcmd_short_mfuev1auth(NULL, 0, 0x1B, key, resp, respPar, NULL);\r
        if (len != 4) {\r
-               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x %u", receivedAnswer[0], len);\r
-               return 1;\r
-       }\r
-       \r
-       if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r
-               Dbprintf("Auth Resp: %02x%02x%02x%02x",\r
-                       receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3]);\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x %u", resp[0], len);\r
+               return 0;\r
        }\r
-       memcpy(pack, receivedAnswer, 4);\r
-       return 0;\r
+\r
+       if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r
+               Dbprintf("Auth Resp: %02x%02x%02x%02x", resp[0],resp[1],resp[2],resp[3]);\r
+\r
+       memcpy(pack, resp, 4);\r
+       return 1;\r
 }\r
 \r
-int mifare_ultra_auth1(uint8_t *blockData){\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 rnd_ab[16] = {0x00};\r
+       uint8_t IV[8] = {0x00};\r
+       uint8_t key[16] = {0x00};\r
+       memcpy(key, keybytes, 16);\r
 \r
        uint16_t len;\r
-       uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r
-       \r
-       len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, receivedAnswer,receivedAnswerPar ,NULL);\r
+       uint8_t resp[19] = {0x00};\r
+       uint8_t respPar[3] = {0,0,0};\r
+\r
+       // REQUEST AUTHENTICATION\r
+       len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, resp, respPar ,NULL);\r
        if (len != 11) {\r
-               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
-               return 1;\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);\r
+               return 0;\r
        }\r
 \r
+       // tag nonce.\r
+       memcpy(enc_random_b,resp+1,8);\r
+\r
+       // decrypt nonce.\r
+       tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );\r
+       rol(random_b,8);\r
+       memcpy(rnd_ab  ,random_a,8);\r
+       memcpy(rnd_ab+8,random_b,8);\r
+\r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r
-               Dbprintf("Auth1 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",\r
-                       receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],\r
-                       receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],\r
-                       receivedAnswer[10]);\r
-               }\r
-       memcpy(blockData, receivedAnswer, 11);\r
-       return 0;\r
-}\r
+               Dbprintf("enc_B: %02x %02x %02x %02x %02x %02x %02x %02x",\r
+                       enc_random_b[0],enc_random_b[1],enc_random_b[2],enc_random_b[3],enc_random_b[4],enc_random_b[5],enc_random_b[6],enc_random_b[7]);\r
 \r
-int mifare_ultra_auth2(uint8_t *key, uint8_t *blockData){\r
+               Dbprintf("    B: %02x %02x %02x %02x %02x %02x %02x %02x",\r
+                       random_b[0],random_b[1],random_b[2],random_b[3],random_b[4],random_b[5],random_b[6],random_b[7]);\r
 \r
-       uint16_t len;\r
-       uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r
-       \r
-       len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, key, receivedAnswer, receivedAnswerPar, NULL);\r
+               Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",\r
+                               rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);\r
+\r
+               Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",\r
+                               rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15] );\r
+       }\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
+       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", receivedAnswer[0]);\r
-               return 1;\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);\r
+               return 0;\r
        }\r
-       \r
+\r
+       uint8_t enc_resp[8] = { 0,0,0,0,0,0,0,0 };\r
+       uint8_t resp_random_a[8] = { 0,0,0,0,0,0,0,0 };\r
+       memcpy(enc_resp, resp+1, 8);\r
+\r
+       // decrypt    out, in, length, key, iv \r
+       tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);\r
+       if ( memcmp(resp_random_a, random_a, 8) != 0 ) {\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("failed authentication");\r
+               return 0;\r
+       }\r
+\r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r
-               Dbprintf("Auth2 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",\r
-                       receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],\r
-                       receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],\r
-                       receivedAnswer[10]);\r
+               Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x", \r
+                               rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],\r
+                               rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);\r
+\r
+               Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",\r
+                               rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],\r
+                               rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15]);\r
+\r
+               Dbprintf("a: %02x %02x %02x %02x %02x %02x %02x %02x",\r
+                               random_a[0],random_a[1],random_a[2],random_a[3],\r
+                               random_a[4],random_a[5],random_a[6],random_a[7]);\r
+\r
+               Dbprintf("b: %02x %02x %02x %02x %02x %02x %02x %02x",\r
+                               resp_random_a[0],resp_random_a[1],resp_random_a[2],resp_random_a[3],\r
+                               resp_random_a[4],resp_random_a[5],resp_random_a[6],resp_random_a[7]);\r
        }\r
-       memcpy(blockData, receivedAnswer, 11);\r
-       return 0;\r
+       return 1;\r
 }\r
 \r
 int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData)\r
@@ -359,6 +378,7 @@ int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData)
        uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
        uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\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
@@ -380,8 +400,6 @@ int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData)
        return 0;\r
 }\r
 \r
-\r
-\r
 int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) \r
 {\r
        // variables\r
@@ -429,7 +447,8 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
        return 0;\r
 }\r
 \r
-int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData) \r
+/* // command not needed, but left for future testing\r
+int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData) \r
 {\r
        uint16_t len;\r
        uint8_t par[3] = {0};  // enough for 18 parity bits\r
@@ -437,7 +456,6 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)
        uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
        uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r
 \r
-       // command MIFARE_CLASSIC_WRITEBLOCK\r
        len = mifare_sendcmd_short(NULL, true, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r
 \r
        if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK\r
@@ -460,20 +478,21 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)
        }\r
        return 0;\r
 }\r
+*/\r
 \r
-int mifare_ultra_special_writeblock(uint8_t blockNo, uint8_t *blockData)\r
+int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)\r
 {\r
        uint16_t len;\r
-       uint8_t d_block[8] = {0x00};\r
+       uint8_t d_block[5] = {0x00};\r
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
        uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
 \r
        // command MIFARE_CLASSIC_WRITEBLOCK\r
        d_block[0]= blockNo;\r
        memcpy(d_block+1,blockData,4);\r
-       AppendCrc14443a(d_block, 6);\r
+       //AppendCrc14443a(d_block, 6);\r
 \r
-       len = mifare_sendcmd_short_special(NULL, 1, 0xA2, d_block, receivedAnswer, receivedAnswerPar, NULL);\r
+       len = mifare_sendcmd(0xA2, d_block, sizeof(d_block), receivedAnswer, receivedAnswerPar, NULL);\r
 \r
        if (receivedAnswer[0] != 0x0A) {   //  0x0a - ACK\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
@@ -664,8 +683,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
-       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
-       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
+       uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
+       uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r
        \r
        len = mifare_sendcmd_special(NULL, 1, 0x02, data, receivedAnswer,receivedAnswerPar,NULL);\r
        if (len == 1) {\r
Impressum, Datenschutz