Add Mifare Classic EV1 set load modulation command

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index bcff74763c48b7c05dc52612f2d0f20658137152..ee6ab7fbb6fbde98f662446a81a54b5df8b2a097 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1196,6 +1196,10 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        SniffMifare(c->arg[0]);
                        break;
 
+               case CMD_MIFARE_SETMOD:
+                       MifareSetMod(c->arg[0], c->d.asBytes);
+                       break;
+
                //mifare desfire
                case CMD_MIFARE_DESFIRE_READBL: break;
                case CMD_MIFARE_DESFIRE_WRITEBL: break;

diff --git a/armsrc/apps.h b/armsrc/apps.h
index 4f1b622aa159a4a07b08599bd0e948e27581cdba..032c4f9da4a38ac4baf96ff4c4ef40e7757813b4 100644 (file)
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -148,6 +148,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
 void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain);  // Work with "magic Chinese" card
 void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain);
 void MifareCIdent();  // is "magic chinese" card?
+void MifareSetMod(uint8_t mod, uint8_t *key);
 void MifareUSetPwd(uint8_t arg0, uint8_t *datain);
 void OnSuccessMagic();
 void OnErrorMagic(uint8_t reason);

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 4bb01a4c5482060aa3930a06c9ff4d9e58fffca6..da574fd09a48476d8015e1577c6070a994c7cfe6 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -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

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 4ebef19c503ef688204590d40552c6358fe759e4..13cbee68587b9c321b50fa645d2ea9704b47192b 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -2451,6 +2451,43 @@ int CmdHf14MfDecryptBytes(const char *Cmd){
        return tryDecryptWord( nt, ar_enc, at_enc, data, len);\r
 }\r
 \r
+int CmdHf14AMfSetMod(const char *Cmd) {\r
+       uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
+       uint8_t mod = 2;\r
+\r
+       char ctmp = param_getchar(Cmd, 0);\r
+       if (ctmp == '0') {\r
+               mod = 0;\r
+       } else if (ctmp == '1') {\r
+               mod = 1;\r
+       }\r
+       int gethexfail = param_gethex(Cmd, 1, key, 12);\r
+       if (mod == 2 || gethexfail) {\r
+               PrintAndLog("Sets the load modulation strength of a MIFARE Classic EV1 card.");\r
+               PrintAndLog("Usage: hf mf setmod <0/1> <block 0 key A>");\r
+               PrintAndLog("       0 = normal modulation");\r
+               PrintAndLog("       1 = strong modulation (default)");\r
+               return 1;\r
+       }\r
+\r
+       UsbCommand c = {CMD_MIFARE_SETMOD, {mod, 0, 0}};\r
+       memcpy(c.d.asBytes, key, 6);\r
+       clearCommandBuffer();\r
+       SendCommand(&c);\r
+\r
+       UsbCommand resp;\r
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {\r
+               uint8_t ok = resp.arg[0] & 0xff;\r
+               PrintAndLog("isOk:%02x", ok);\r
+               if (!ok) {\r
+                       PrintAndLog("Failed.");\r
+               }\r
+       } else {\r
+               PrintAndLog("Command execute timeout");\r
+       }\r
+       return 0;\r
+}\r
+\r
 static command_t CommandTable[] = {\r
        {"help",                CmdHelp,                                1, "This help"},\r
        {"dbg",                 CmdHF14AMfDbg,                  0, "Set default debug mode"},\r
@@ -2480,6 +2517,7 @@ static command_t CommandTable[] = {
        {"cload",               CmdHF14AMfCLoad,                0, "Load dump into magic Chinese card"},\r
        {"csave",               CmdHF14AMfCSave,                0, "Save dump from magic Chinese card into file or emulator"},\r
        {"decrypt",             CmdHf14MfDecryptBytes,  1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},\r
+       {"setmod",              CmdHf14AMfSetMod,               0, "Set MIFARE Classic EV1 load modulation strength"},\r
        {NULL, NULL, 0, NULL}\r
 };\r
 \r

diff --git a/client/cmdhfmf.h b/client/cmdhfmf.h
index e102dbd0edb7655f3153883bca0aaa50025b3537..72924cae63ede29aee3a0cdce79eab973f691b8b 100644 (file)
--- a/client/cmdhfmf.h
+++ b/client/cmdhfmf.h
@@ -58,6 +58,7 @@ int CmdHF14AMfCGetSc(const char* cmd);
 int CmdHF14AMfCLoad(const char* cmd);\r
 int CmdHF14AMfCSave(const char* cmd);\r
 int CmdHf14MfDecryptBytes(const char *Cmd);\r
+int CmdHf14AMfSetMod(const char *Cmd);\r
 \r
 void showSectorTable(void);\r
 void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose);\r

diff --git a/client/hid-flasher/usb_cmd.h b/client/hid-flasher/usb_cmd.h
index 4d0f5e8eafb6a2634e9058382f52d7dea2615937..133a9eda93ae212d2f1ebdb300f8a70588bf84f5 100644 (file)
--- a/client/hid-flasher/usb_cmd.h
+++ b/client/hid-flasher/usb_cmd.h
@@ -186,6 +186,7 @@ typedef struct {
 #define CMD_MIFAREU_WRITEBL_COMPAT                                                           0x0723
 
 #define CMD_MIFARE_CHKKEYS                                                0x0623
+#define CMD_MIFARE_SETMOD                                                 0x0624
 
 #define CMD_MIFARE_SNIFFER                                                0x0630
 //ultralightC

diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua
index 7aaa17459d9fde0032ea21bc44f818848c640996..a14288c239040b578782bf900765574da69fa6d5 100644 (file)
--- a/client/lualibs/commands.lua
+++ b/client/lualibs/commands.lua
@@ -159,6 +159,7 @@ local _commands = {
        CMD_MIFAREU_WRITEBL_COMPAT =                                         0x0723,
        
        CMD_MIFARE_CHKKEYS =                                                 0x0623,
+       CMD_MIFARE_SETMOD =                                                  0x0624,
 
        CMD_MIFARE_SNIFFER =                                                 0x0630,
 

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index e312f93ac1c92d9f31bcb4770de02e0ad73150df..b2189ef27398e58c1fa7d77ad8b8729199c947bb 100644 (file)
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -200,6 +200,7 @@ typedef struct{
 #define CMD_MIFAREU_WRITEBL_COMPAT                                                           0x0723
 
 #define CMD_MIFARE_CHKKEYS                                                0x0623
+#define CMD_MIFARE_SETMOD                                                 0x0624
 
 #define CMD_MIFARE_SNIFFER                                                0x0630
 //ultralightC