Merge pull request #90 from 4m4rOk/master

[proxmark3-svn] / armsrc / mifarecmd.c

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 1e398bc8e08c9ae2a134e64d1a0925d1b519c19b..da574fd09a48476d8015e1577c6070a994c7cfe6 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -961,7 +961,7 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
 \r
        uint8_t blockNo = arg0 & 0xFF;\r
        uint8_t keyType = (arg0 >> 8) & 0xFF;\r
-       uint8_t searchType = (arg1 >> 8 ) & 0xFF;\r
+       //uint8_t searchType = (arg1 >> 8 ) & 0xFF;\r
        bool clearTrace = arg1 & 0xFF;\r
        uint8_t keyCount = arg2;\r
        uint64_t ui64Key = 0;\r
@@ -1429,6 +1429,64 @@ void OnErrorMagic(uint8_t reason){
        cmd_send(CMD_ACK,0,reason,0,0,0);\r
        OnSuccessMagic();\r
 }\r
+\r
+void MifareSetMod(uint8_t mod, uint8_t *key) {\r
+       uint64_t ui64Key = bytes_to_num(key, 6);\r
+\r
+       // variables\r
+       uint8_t isOK = 0;\r
+       uint8_t uid[10] = {0};\r
+       uint32_t cuid = 0;\r
+       struct Crypto1State mpcs = {0, 0};\r
+       struct Crypto1State *pcs = &mpcs;\r
+       int respLen = 0;\r
+       uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE] = {0};\r
+       uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE] = {0};\r
+\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+\r
+       clear_trace();\r
+       set_tracing(true);\r
+\r
+       LED_A_ON();\r
+       LED_B_OFF();\r
+       LED_C_OFF();\r
+\r
+       while (true) {\r
+               if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");\r
+                       break;\r
+               }\r
+\r
+               if(mifare_classic_auth(pcs, cuid, 0, 0, ui64Key, AUTH_FIRST)) {\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Auth error");\r
+                       break;\r
+               }\r
+\r
+               if (((respLen = mifare_sendcmd_short(pcs, 1, 0x43, mod, receivedAnswer, receivedAnswerPar, NULL)) != 1) || (receivedAnswer[0] != 0x0a)) {\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("SetMod error; response[0]: %hhX, len: %d", receivedAnswer[0], respLen);\r
+                       break;\r
+               }\r
+\r
+               if(mifare_classic_halt(pcs, cuid)) {\r
+                       if (MF_DBGLEVEL >= 1)   Dbprintf("Halt error");\r
+                       break;\r
+               }\r
+\r
+               isOK = 1;\r
+               break;\r
+       }\r
+\r
+       crypto1_destroy(pcs);\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
+}\r
+\r
 //\r
 // DESFIRE\r
 //\r