FIX: an error that I introduced to the csetblock command with wrong length of crc...

CHG:  variable name in csetblock change.  just trying to be consistant.
ADD:  code clean up in hf 14a,  added some help text methods.

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index ba3034bf23bb333761339343d6ffa55155643078..1e42d5b45875e097cb2c753bde2f2169e4286a27 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1092,8 +1092,8 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
                OnErrorMagic(4);\r
        };\r
        \r
                OnErrorMagic(4);\r
        };\r
        \r

-       memcpy(data, datain, sizeof(data));\r
-       AppendCrc14443a(data, sizeof(data));\r
+       memcpy(data, datain, 16);\r
+       AppendCrc14443a(data, 16);\r

        \r
        ReaderTransmit(data, sizeof(data), NULL);\r
        if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {\r
        \r
        ReaderTransmit(data, sizeof(data), NULL);\r
        if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {\r


@@ -1118,8 +1118,6 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
        uint8_t workFlags = arg0;\r
        uint8_t blockNo = arg1;\r
 \r
        uint8_t workFlags = arg0;\r
        uint8_t blockNo = arg1;\r
 \r

-       Dbprintf("ICE :: CGetBlocks Flags %02x", workFlags);\r
-       \r

        // variables\r
        uint8_t data[MAX_MIFARE_FRAME_SIZE];\r
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
        // variables\r
        uint8_t data[MAX_MIFARE_FRAME_SIZE];\r
        uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 33197cf5549c0f7efcdf4466ef1e5c3985ccd5e7..f94296c0a00c06e46334ebff1d0b7dc955c00894 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -127,6 +127,48 @@ char* getTagInfo(uint8_t uid) {
        return manufactureMapping[len-1].desc; 
 }
 
        return manufactureMapping[len-1].desc; 
 }
 

+
+int usage_hf_14a_sim(void) {
+       PrintAndLog("\n Emulating ISO/IEC 14443 type A tag with 4 or 7 byte UID\n");
+       PrintAndLog("Usage: hf 14a sim t <type> u <uid> x");
+       PrintAndLog("  Options : ");
+       PrintAndLog("    h     : this help");
+       PrintAndLog("    t     : 1 = MIFARE Classic");
+       PrintAndLog("            2 = MIFARE Ultralight");
+       PrintAndLog("            3 = MIFARE Desfire");
+       PrintAndLog("            4 = ISO/IEC 14443-4");
+       PrintAndLog("            5 = MIFARE Tnp3xxx");
+       PrintAndLog("            6 = MIFARE Mini");
+       PrintAndLog("            7 = AMIIBO (NTAG 215),  pack 0x8080");
+       PrintAndLog("    u     : 4 or 7 byte UID");
+       PrintAndLog("    x     : (Optional) performs the 'reader attack', nr/ar attack against a legitimate reader");
+       PrintAndLog("\n   sample : hf 14a sim t 1 u 1122344");
+       PrintAndLog("          : hf 14a sim t 1 u 1122344 x\n");
+       return 0;
+}
+int usage_hf_14a_sniff(void){
+       PrintAndLog("It get data from the field and saves it into command buffer.");
+       PrintAndLog("Buffer accessible from command 'hf list 14a'");
+       PrintAndLog("Usage:  hf 14a sniff [c][r]");
+       PrintAndLog("c - triggered by first data from card");
+       PrintAndLog("r - triggered by first 7-bit request from reader (REQ,WUP,...)");
+       PrintAndLog("sample: hf 14a sniff c r");
+       return 0;
+}
+int usage_hf_14a_raw(void){
+       PrintAndLog("Usage: hf 14a raw [-h] [-r] [-c] [-p] [-a] [-T] [-t] <milliseconds> [-b] <number of bits>  <0A 0B 0C ... hex>");
+       PrintAndLog("       -h    this help");
+       PrintAndLog("       -r    do not read response");
+       PrintAndLog("       -c    calculate and append CRC");
+       PrintAndLog("       -p    leave the signal field ON after receive");
+       PrintAndLog("       -a    active signal field ON without select");
+       PrintAndLog("       -s    active signal field ON with select");
+       PrintAndLog("       -b    number of bits to send. Useful for send partial byte");
+       PrintAndLog("       -t    timeout in ms");
+       PrintAndLog("       -T    use Topaz protocol to send command");
+       return 0;
+}
+

 int CmdHF14AList(const char *Cmd)
 {
        PrintAndLog("Deprecated command, use 'hf list 14a' instead");
 int CmdHF14AList(const char *Cmd)
 {
        PrintAndLog("Deprecated command, use 'hf list 14a' instead");


@@ -456,27 +498,6 @@ int CmdHF14ACUIDs(const char *Cmd)
        return 1;
 }
 
        return 1;
 }
 

-
-static int usage_hf_14a_sim(void)
-{
-       PrintAndLog("\n Emulating ISO/IEC 14443 type A tag with 4 or 7 byte UID\n");
-       PrintAndLog("Usage: hf 14a sim t <type> u <uid> x");
-       PrintAndLog("  Options : ");
-       PrintAndLog("    h     : this help");
-       PrintAndLog("    t     : 1 = MIFARE Classic");
-       PrintAndLog("            2 = MIFARE Ultralight");
-       PrintAndLog("            3 = MIFARE Desfire");
-       PrintAndLog("            4 = ISO/IEC 14443-4");
-       PrintAndLog("            5 = MIFARE Tnp3xxx");
-       PrintAndLog("            6 = MIFARE Mini");
-       PrintAndLog("            7 = AMIIBO (NTAG 215),  pack 0x8080");
-       PrintAndLog("    u     : 4 or 7 byte UID");
-       PrintAndLog("    x     : (Optional) performs the 'reader attack', nr/ar attack against a legitimate reader");
-       PrintAndLog("\n   sample : hf 14a sim t 1 u 1122344");
-       PrintAndLog("          : hf 14a sim t 1 u 1122344 x\n");
-       return 0;
-}
-

 // ## simulate iso14443a tag
 // ## greg - added ability to specify tag UID
 int CmdHF14ASim(const char *Cmd)
 // ## simulate iso14443a tag
 // ## greg - added ability to specify tag UID
 int CmdHF14ASim(const char *Cmd)


@@ -486,9 +507,7 @@ int CmdHF14ASim(const char *Cmd)
        uint8_t tagtype = 1;
        uint64_t uid = 0;
        uint8_t cmdp = 0;
        uint8_t tagtype = 1;
        uint64_t uid = 0;
        uint8_t cmdp = 0;

-       
-       clearCommandBuffer();
-       
+

        while(param_getchar(Cmd, cmdp) != 0x00)
        {
                switch(param_getchar(Cmd, cmdp))
        while(param_getchar(Cmd, cmdp) != 0x00)
        {
                switch(param_getchar(Cmd, cmdp))


@@ -541,6 +560,7 @@ int CmdHF14ASim(const char *Cmd)
        UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }};
        
        num_to_bytes(uid, 7, c.d.asBytes);
        UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }};
        
        num_to_bytes(uid, 7, c.d.asBytes);

+       clearCommandBuffer();

        SendCommand(&c);        
 
        uint8_t data[40];
        SendCommand(&c);        
 
        uint8_t data[40];


@@ -567,15 +587,7 @@ int CmdHF14ASniff(const char *Cmd) {
        int param = 0;
        
        uint8_t ctmp = param_getchar(Cmd, 0) ;
        int param = 0;
        
        uint8_t ctmp = param_getchar(Cmd, 0) ;

-       if (ctmp == 'h' || ctmp == 'H') {
-               PrintAndLog("It get data from the field and saves it into command buffer.");
-               PrintAndLog("Buffer accessible from command 'hf list 14a'");
-               PrintAndLog("Usage:  hf 14a sniff [c][r]");
-               PrintAndLog("c - triggered by first data from card");
-               PrintAndLog("r - triggered by first 7-bit request from reader (REQ,WUP,...)");
-               PrintAndLog("sample: hf 14a sniff c r");
-               return 0;
-       }       
+       if (ctmp == 'h' || ctmp == 'H') return usage_hf_14a_sniff();

        
        for (int i = 0; i < 2; i++) {
                ctmp = param_getchar(Cmd, i);
        
        for (int i = 0; i < 2; i++) {
                ctmp = param_getchar(Cmd, i);


@@ -584,11 +596,11 @@ int CmdHF14ASniff(const char *Cmd) {
        }
 
   UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
        }
 
   UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};

+  clearCommandBuffer();

   SendCommand(&c);
   return 0;
 }
 
   SendCommand(&c);
   return 0;
 }
 

-

 int CmdHF14ACmdRaw(const char *cmd) {
     UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
     bool reply=1;
 int CmdHF14ACmdRaw(const char *cmd) {
     UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
     bool reply=1;


@@ -606,19 +618,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
        uint16_t datalen=0;
        uint32_t temp;
 
        uint16_t datalen=0;
        uint32_t temp;
 

-    if (strlen(cmd)<2) {
-        PrintAndLog("Usage: hf 14a raw [-r] [-c] [-p] [-a] [-T] [-t] <milliseconds> [-b] <number of bits>  <0A 0B 0C ... hex>");
-        PrintAndLog("       -r    do not read response");
-        PrintAndLog("       -c    calculate and append CRC");
-        PrintAndLog("       -p    leave the signal field ON after receive");
-        PrintAndLog("       -a    active signal field ON without select");
-        PrintAndLog("       -s    active signal field ON with select");
-        PrintAndLog("       -b    number of bits to send. Useful for send partial byte");
-               PrintAndLog("       -t    timeout in ms");
-               PrintAndLog("       -T    use Topaz protocol to send command");
-        return 0;
-    }
-
+    if (strlen(cmd)<2) return usage_hf_14a_raw();

 
     // strip
     while (*cmd==' ' || *cmd=='\t') cmd++;
 
     // strip
     while (*cmd==' ' || *cmd=='\t') cmd++;


@@ -627,6 +627,9 @@ int CmdHF14ACmdRaw(const char *cmd) {
         if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
         if (cmd[i]=='-') {
             switch (cmd[i+1]) {
         if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
         if (cmd[i]=='-') {
             switch (cmd[i+1]) {

+                               case 'H':
+                               case 'h':
+                                       return usage_hf_14a_raw();

                 case 'r': 
                     reply = FALSE;
                     break;
                 case 'r': 
                     reply = FALSE;
                     break;


@@ -661,8 +664,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
                                        topazmode = TRUE;
                                        break;
                 default:
                                        topazmode = TRUE;
                                        break;
                 default:

-                    PrintAndLog("Invalid option");
-                    return 0;
+                    return usage_hf_14a_raw();

             }
             i+=2;
             continue;
             }
             i+=2;
             continue;


@@ -744,9 +746,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
     return 0;
 }
 
     return 0;
 }
 

-
-static void waitCmd(uint8_t iSelect)
-{
+static void waitCmd(uint8_t iSelect) {

     uint8_t *recv;
     UsbCommand resp;
     char *hexout;
     uint8_t *recv;
     UsbCommand resp;
     char *hexout;

diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index 17c40bac1db68442fbe85d34489fbd5be2c6185b..93cbfd8fab1bcd2d5fa919eff1b60010c7473b3d 100644 (file)
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -13,7 +13,6 @@
 #define CMDHF14A_H__
 
 int CmdHF14A(const char *Cmd);
 #define CMDHF14A_H__
 
 int CmdHF14A(const char *Cmd);

-

 int CmdHF14AList(const char *Cmd);
 int CmdHF14AMifare(const char *Cmd);
 int CmdHF14AReader(const char *Cmd);
 int CmdHF14AList(const char *Cmd);
 int CmdHF14AMifare(const char *Cmd);
 int CmdHF14AReader(const char *Cmd);


@@ -22,4 +21,7 @@ int CmdHF14ASniff(const char *Cmd);
 
 char* getTagInfo(uint8_t uid);
 
 
 char* getTagInfo(uint8_t uid);
 

+int usage_hf_14a_sim(void);
+int usage_hf_14a_sniff(void);
+int usage_hf_14a_raw(void);

 #endif
 #endif

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index ed362cd1f337a59d86843c9cc9287c4d7b27bc0d..1d1dc2f433456a197f06e28010877308d14e3caa 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1541,7 +1541,7 @@ int CmdHF14AMfCSetUID(const char *Cmd)
 \r
 int CmdHF14AMfCSetBlk(const char *Cmd)\r
 {\r
 \r
 int CmdHF14AMfCSetBlk(const char *Cmd)\r
 {\r

-       uint8_t memBlock[16] = {0x00};\r
+       uint8_t block[16] = {0x00};\r

        uint8_t blockNo = 0;\r
        uint8_t params = MAGIC_SINGLE;\r
        int res;\r
        uint8_t blockNo = 0;\r
        uint8_t params = MAGIC_SINGLE;\r
        int res;\r


@@ -1556,7 +1556,7 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
 \r
        blockNo = param_get8(Cmd, 0);\r
 \r
 \r
        blockNo = param_get8(Cmd, 0);\r
 \r

-       if (param_gethex(Cmd, 1, memBlock, 32)) {\r
+       if (param_gethex(Cmd, 1, block, 32)) {\r

                PrintAndLog("block data must include 32 HEX symbols");\r
                return 1;\r
        }\r
                PrintAndLog("block data must include 32 HEX symbols");\r
                return 1;\r
        }\r


@@ -1565,9 +1565,9 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
        if (ctmp == 'w' || ctmp == 'W')\r
                params |= MAGIC_WIPE;\r
        \r
        if (ctmp == 'w' || ctmp == 'W')\r
                params |= MAGIC_WIPE;\r
        \r

-       PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16));\r
+       PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(block, 16));\r

 \r
 \r

-       res = mfCSetBlock(blockNo, memBlock, NULL, params);\r
+       res = mfCSetBlock(blockNo, block, NULL, params);\r

        if (res) {\r
                PrintAndLog("Can't write block. error=%d", res);\r
                return 1;\r
        if (res) {\r
                PrintAndLog("Can't write block. error=%d", res);\r
                return 1;\r