FIX: since the correctionNeeded logic changed, with PR #87 (https://github.com...

[proxmark3-svn] / armsrc / mifarecmd.c

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 6bef0cbd7efb6d115a6b07708297d38587496f5a..2ab076b626575975a396f905dc2510633124cef1 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -14,11 +14,6 @@
 //-----------------------------------------------------------------------------\r
 \r
 #include "mifarecmd.h"\r
-#include "apps.h"\r
-#include "util.h"\r
-#include "crc.h"\r
-#include "protocols.h"\r
-#include "parity.h"\r
 \r
 //-----------------------------------------------------------------------------\r
 // Select, Authenticate, Read a MIFARE tag. \r
@@ -379,7 +374,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
        LED_C_OFF();\r
 \r
        while (true) {\r
-                       if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
+               if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
                        if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
                        break;\r
                };\r
@@ -403,14 +398,11 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
                break;\r
        }\r
        \r
-       //  ----------------------------- crypto1 destroy\r
        crypto1_destroy(pcs);\r
        \r
        if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");\r
 \r
-       LED_B_ON();\r
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
-       LED_B_OFF();\r
 \r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
@@ -613,7 +605,7 @@ int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {
 // Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on \r
 // Computer and Communications Security, 2015\r
 //-----------------------------------------------------------------------------\r
-#define AUTHENTICATION_TIMEOUT  1000 //848                     // card times out 1ms after wrong authentication (according to NXP documentation)\r
+#define AUTHENTICATION_TIMEOUT  848 //848                      // card times out 1ms after wrong authentication (according to NXP documentation)\r
 #define PRE_AUTHENTICATION_LEADTIME 400                // some (non standard) cards need a pause after select before they are ready for first authentication \r
 \r
 void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain)\r
@@ -644,14 +636,17 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
        LED_A_ON();\r
        LED_C_OFF();\r
 \r
+       BigBuf_free(); BigBuf_Clear_ext(false); \r
+       clear_trace();\r
+       set_tracing(FALSE);\r
+       \r
        if (initialize) {\r
                iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-               clear_trace();\r
-               set_tracing(true);\r
        }\r
        \r
        LED_C_ON();\r
        \r
+       uint8_t dummy_answer = 0;       \r
        uint16_t num_nonces = 0;\r
        bool have_uid = false;\r
        for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) {\r
@@ -702,7 +697,6 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
                }\r
        \r
                // send a dummy byte as reader response in order to trigger the cards authentication timeout\r
-               uint8_t dummy_answer = 0;\r
                ReaderTransmit(&dummy_answer, 1, NULL);\r
                timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT;\r
                \r
@@ -711,7 +705,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
                        memcpy(buf+i, receivedAnswer, 4);\r
                        nt_par_enc = par_enc[0] & 0xf0;\r
                } else {\r
-                       nt_par_enc |= par_enc[0] >> 4;\r
+                       nt_par_enc |= par_enc[0]  >> 4;\r
                        memcpy(buf+i+4, receivedAnswer, 4);\r
                        memcpy(buf+i+8, &nt_par_enc, 1);\r
                        i += 9;\r
@@ -721,9 +715,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
        }\r
 \r
        LED_C_OFF();\r
-       \r
-       crypto1_destroy(pcs);\r
-       \r
+       crypto1_destroy(pcs);   \r
        LED_B_ON();\r
        cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));\r
        LED_B_OFF();\r
@@ -1220,10 +1212,9 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
                        if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
                                if (MF_DBGLEVEL >= MF_DBG_ERROR)        Dbprintf("Can't select card");\r
                                errormsg = MAGIC_UID;\r
-                               // break;\r
                        }\r
-                       \r
-                       if ( mifare_classic_halt_ex(NULL) ) break;\r
+                       mifare_classic_halt_ex(NULL);\r
+                       break;\r
                }\r
        \r
                // wipe tag, fill it with zeros\r
@@ -1242,7 +1233,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
                                break;\r
                        }\r
 \r
-                       if ( mifare_classic_halt_ex(NULL) ) break;\r
+                       mifare_classic_halt_ex(NULL);\r
                }       \r
 \r
                // write block\r
@@ -1279,7 +1270,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
                }       \r
        \r
                if (workFlags & MAGIC_OFF) \r
-                       if ( mifare_classic_halt_ex(NULL) ) break;\r
+                       mifare_classic_halt_ex(NULL);\r
                \r
                isOK = true;\r
                break;\r
@@ -1367,25 +1358,53 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
 }\r
 \r
 void MifareCIdent(){\r
-       \r
+       #define GEN_1A 1\r
+       #define GEN_1B 2\r
+       #define GEN_2  4\r
        // variables\r
-       bool isOK = true;       \r
-       uint8_t receivedAnswer[1] = {0x00};\r
-       uint8_t receivedAnswerPar[1] = {0x00};\r
-\r
+       uint8_t isGen = 0;\r
+       uint8_t rec[1] = {0x00};\r
+       uint8_t recpar[1] = {0x00};\r
+       \r
+       // Generation 1 test\r
        ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);\r
-       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-               isOK = false;\r
-       }\r
-\r
+       if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {\r
+               goto TEST2;\r
+       };\r
+       isGen = GEN_1B;\r
+       \r
        ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
-       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-               isOK = false;\r
-       }\r
+       if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {\r
+               goto OUT;\r
+       };      \r
+       isGen = GEN_1A;\r
+       goto OUT;\r
+\r
+TEST2:;\r
+/*\r
+       // Generation 2 test\r
+       struct Crypto1State mpcs = {0, 0};\r
+       struct Crypto1State *pcs = &mpcs;\r
 \r
+       // halt previous.\r
+       mifare_classic_halt(NULL, 0);\r
+       \r
+       //select\r
+       if (!iso14443a_select_card(NULL, NULL, NULL, true, 0)) {\r
+               goto OUT;\r
+       };\r
+       \r
+       // MIFARE_CLASSIC_WRITEBLOCK 0xA0\r
+       // ACK 0x0a\r
+       uint16_t len = mifare_sendcmd_short(pcs, 1, 0xA0, 0, rec, recpar, NULL);\r
+       if ((len != 1) || (rec[0] != 0x0A)) {   \r
+               isGen = GEN_2;  \r
+       };\r
+       */\r
+OUT:;\r
        // removed the if,  since some magic tags misbehavies and send an answer to it.\r
        mifare_classic_halt(NULL, 0);\r
-       cmd_send(CMD_ACK,isOK,0,0,0,0);\r
+       cmd_send(CMD_ACK,isGen, 0, 0, 0, 0);\r
 }\r
 \r
 void OnSuccessMagic(){\r