USB comm: prepare for @micolous change (PR#463) (#587)

[proxmark3-svn] / client / cmdlfhitag.c

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index ad8fd33bf4886077b1b43ee62009e08e58af697c..73c02a1409a41b0526b9fbef9bc02bfe35c8fb1e 100644 (file)
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -17,9 +17,9 @@
 #include "cmdparser.h"
 #include "common.h"
 #include "util.h"
+#include "parity.h"
 #include "hitag2.h"
 #include "hitagS.h"
-#include "sleep.h"
 #include "cmdmain.h"
 
 static int CmdHelp(const char *Cmd);
@@ -108,15 +108,9 @@ int CmdLFHitagList(const char *Cmd)
                char line[1000] = "";
                int j;
                for (j = 0; j < len; j++) {
-                 int oddparity = 0x01;
-                 int k;
-
-                 for (k=0;k<8;k++) {
-                       oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
-                 }
 
                  //if((parityBits >> (len - j - 1)) & 0x01) {
-                 if (isResponse && (oddparity != ((parityBits >> (len - j - 1)) & 0x01))) {
+                 if (isResponse && (oddparity8(frame[j]) != ((parityBits >> (len - j - 1)) & 0x01))) {
                        sprintf(line+(j*4), "%02x!  ", frame[j]);
                  }
                  else {
@@ -245,6 +239,7 @@ int CmdLFHitagReader(const char *Cmd) {
        c.arg[0] = htf;
 
        // Send the command to the proxmark
+       clearCommandBuffer();
        SendCommand(&c);
 
        UsbCommand resp;
@@ -355,7 +350,9 @@ int CmdLFHitagWP(const char *Cmd) {
                        c.arg[2]= param_get32ex(Cmd, 2, 0, 10);
                        num_to_bytes(param_get32ex(Cmd,3,0,16),4,htd->auth.data);
                } break;
-               case 04: { //WHTSF_KEY
+               case 04:
+               case 24:
+               { //WHTSF_KEY
                        num_to_bytes(param_get64ex(Cmd,1,0,16),6,htd->crypto.key);
                        c.arg[2]= param_get32ex(Cmd, 2, 0, 10);
                        num_to_bytes(param_get32ex(Cmd,3,0,16),4,htd->crypto.data);
@@ -369,6 +366,7 @@ int CmdLFHitagWP(const char *Cmd) {
                        PrintAndLog("  04 <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag S tag");
                        PrintAndLog(" Hitag1 (1*)");
                        PrintAndLog(" Hitag2 (2*)");
+                       PrintAndLog("  24 <key> (set to 0 if no authentication is needed) <page> <byte0...byte3> write page on a Hitag S tag");
                        return 1;
                } break;
        }