Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / armsrc / mifareutil.c

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 8c44445f5c01a614cc41a0b88de01617c03d0123..109b91b0efb1bdc961b5693af83ffcbc5f05015d 100644 (file)
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -315,34 +315,35 @@ int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){
        uint16_t len;\r
        uint8_t resp[4];\r
        uint8_t respPar[1];\r
-       uint8_t key[4] = {0x00};        \r
+       uint8_t key[4] = {0x00};\r
        memcpy(key, keybytes, 4);\r
-       \r
+\r
        Dbprintf("EV1 Auth : %02x%02x%02x%02x", key[0], key[1], key[2], key[3]);\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", resp[0], len);\r
                return 0;\r
        }\r
-       \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
+               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_auth(uint8_t *keybytes){\r
 \r
-       // 3des2k\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
+       uint8_t key[16] = {0x00};\r
        memcpy(key, keybytes, 16);\r
-       \r
+\r
        uint16_t len;\r
        uint8_t resp[19] = {0x00};\r
        uint8_t respPar[3] = {0,0,0};\r
@@ -362,21 +363,41 @@ int mifare_ultra_auth(uint8_t *keybytes){
        rol(random_b,8);\r
        memcpy(rnd_ab  ,random_a,8);\r
        memcpy(rnd_ab+8,random_b,8);\r
-       \r
+\r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\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
+\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
                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
+\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
+\r
+       // encrypt    out, in, length, key, iv\r
+       tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);\r
+\r
+       len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, resp, respPar, NULL);\r
+       if (len != 11) {\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);\r
+               return 0;\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
        // encrypt    out, in, length, key, iv\r
        tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);\r
 \r
@@ -409,7 +430,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
                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
+\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
@@ -494,18 +515,18 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
 \r
 int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData) \r
 {\r
-    uint16_t len;     \r
+       uint16_t len;\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
+\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
                if (MF_DBGLEVEL >= MF_DBG_ERROR)\r
-                       Dbprintf("Cmd Addr Error: %02x", receivedAnswer[0]);  \r
+                       Dbprintf("Cmd Addr Error: %02x", receivedAnswer[0]);\r
         return 1;\r
     }\r
 \r
@@ -514,15 +535,15 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)
 \r
        ReaderTransmitPar(d_block, sizeof(d_block), par, NULL);\r
 \r
-    len = ReaderReceive(receivedAnswer, receivedAnswerPar);    \r
+       len = ReaderReceive(receivedAnswer, receivedAnswerPar);\r
 \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
-    }        \r
+       }\r
     return 0;\r
-} \r
+}\r
 \r
 int mifare_ultra_special_writeblock(uint8_t blockNo, uint8_t *blockData)\r
 {\r