Merge pull request #34 from marshmellow42/master

[proxmark3-svn] / client / cmdhf14b.c

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 83d6633c1e72e31d29cec4f714fabe9d87f425d9..c42d54c585888e37aa0b6e2104464de3d67a18f4 100644 (file)
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -147,6 +147,7 @@ int CmdHF14BList(const char *Cmd)
 {
   uint8_t got[960];
   GetFromBigBuf(got,sizeof(got),0);
 {
   uint8_t got[960];
   GetFromBigBuf(got,sizeof(got),0);

+  WaitForResponse(CMD_ACK,NULL);

 
   PrintAndLog("recorded activity:");
   PrintAndLog(" time  :rssi: who bytes");
 
   PrintAndLog("recorded activity:");
   PrintAndLog(" time  :rssi: who bytes");


@@ -181,6 +182,9 @@ int CmdHF14BList(const char *Cmd)
 
     uint8_t *frame = (got+i+9);
 
 
     uint8_t *frame = (got+i+9);
 

+       // Break and stick with current result if buffer was not completely full
+       if (frame[0] == 0x44 && frame[1] == 0x44 && frame[2] == 0x44 && frame[3] == 0x44) break; 
+       

     char line[1000] = "";
     int j;
     for(j = 0; j < len; j++) {
     char line[1000] = "";
     int j;
     for(j = 0; j < len; j++) {


@@ -333,6 +337,11 @@ int CmdHF14BCmdRaw (const char *cmd) {
         PrintAndLog("Invalid char on input");
         return 0;
     }
         PrintAndLog("Invalid char on input");
         return 0;
     }

+    if (datalen == 0)
+    {
+      PrintAndLog("Missing data input");
+      return 0;
+    }

     if(crc)
     {
         uint8_t first, second;
     if(crc)
     {
         uint8_t first, second;


@@ -358,7 +367,7 @@ int CmdHF14BCmdRaw (const char *cmd) {
             if (hexout != NULL) {
                 uint8_t first, second;
                 for (int i = 0; i < resp.arg[0]; i++) { // data in hex
             if (hexout != NULL) {
                 uint8_t first, second;
                 for (int i = 0; i < resp.arg[0]; i++) { // data in hex

-                    sprintf(&hexout[i * 3], "%02hX ", recv[i]);
+                    sprintf(&hexout[i * 3], "%02X ", recv[i]);

                 }
                 PrintAndLog("%s", hexout);
                 free(hexout);
                 }
                 PrintAndLog("%s", hexout);
                 free(hexout);