X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b41534d1421974a1d4eaf6570ee97ef5fad6527b..6255c8b107cdce88f4863a6133aea293d917f993:/client/cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index a3d58523..2266baa4 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -33,6 +33,12 @@ static int CmdHelp(const char *Cmd);
 //by marshmellow
 void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx)
 {
+	if (buff == NULL) 
+		return;
+	
+	if ( size >= MAX_DEMOD_BUF_LEN)
+		size = MAX_DEMOD_BUF_LEN;
+	
 	size_t i = 0;
 	for (; i < size; i++){
 		DemodBuffer[i]=buff[startIdx++];
@@ -277,16 +283,30 @@ void printEM410x(uint32_t hi, uint64_t id)
       PrintAndLog("EM TAG ID    : %06x%016llx", hi, id);
     } else{
       //output 40 bit em id
-      PrintAndLog("EM TAG ID    : %010llx", id);
-      PrintAndLog("Unique TAG ID: %010llx",  id2lo);
-      PrintAndLog("DEZ 8        : %08lld",id & 0xFFFFFF);
-      PrintAndLog("DEZ 10       : %010lld",id & 0xFFFFFF);
-      PrintAndLog("DEZ 5.5      : %05lld.%05lld",(id>>16LL) & 0xFFFF,(id & 0xFFFF));
-      PrintAndLog("DEZ 3.5A     : %03lld.%05lld",(id>>32ll),(id & 0xFFFF));
-      PrintAndLog("DEZ 14/IK2   : %014lld",id);
-      PrintAndLog("DEZ 15/IK3   : %015lld",id2lo);
-      PrintAndLog("Other        : %05lld_%03lld_%08lld",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF));  
-    }
+    PrintAndLog("EM TAG ID    : %010llx", id);
+    PrintAndLog("Unique TAG ID: %010llx",  id2lo);
+    PrintAndLog("DEZ 8        : %08lld",id & 0xFFFFFF);
+    PrintAndLog("DEZ 10       : %010lld",id & 0xFFFFFFFF);
+    PrintAndLog("DEZ 5.5      : %05lld.%05lld",(id>>16LL) & 0xFFFF,(id & 0xFFFF));
+    PrintAndLog("DEZ 3.5A     : %03lld.%05lld",(id>>32ll),(id & 0xFFFF));
+	PrintAndLog("DEZ 3.5B     : %03lld.%05lld",(id & 0xFF000000) >> 24,(id & 0xFFFF));
+	PrintAndLog("DEZ 3.5C     : %03lld.%05lld",(id & 0xFF0000) >> 16,(id & 0xFFFF));
+    PrintAndLog("DEZ 14/IK2   : %014lld",id);
+    PrintAndLog("DEZ 15/IK3   : %015lld",id2lo);
+    PrintAndLog("Other        : %05lld_%03lld_%08lld",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF));  
+	PrintAndLog("DEZ 20/ZK    : %02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld",
+			(id2lo & 0xf000000000) >> 36,
+			(id2lo & 0x0f00000000) >> 32,
+			(id2lo & 0x00f0000000) >> 28,
+			(id2lo & 0x000f000000) >> 24,
+			(id2lo & 0x0000f00000) >> 20,
+			(id2lo & 0x00000f0000) >> 16,
+			(id2lo & 0x000000f000) >> 12,
+			(id2lo & 0x0000000f00) >> 8,
+			(id2lo & 0x00000000f0) >> 4,
+			(id2lo & 0x000000000f)
+			);
+  }
   }
   return;
 }
@@ -668,7 +688,7 @@ int CmdG_Prox_II_Demod(const char *Cmd)
   if (ans < 0){
     if (g_debugMode) PrintAndLog("Error gProxII_Demod");
     return 0;
-  }
+    }
   //got a good demod
   uint32_t ByteStream[65] = {0x00};
   uint8_t xorKey=0;
@@ -773,7 +793,7 @@ int AutoCorrelate(int window, bool SaveGrph, bool verbose)
     } else if (sum > maxSum){
       maxSum=sum;
       lastMax = i;
-    }
+  }
   }
   if (Correlation==0){
     //try again with wider margin
@@ -789,8 +809,8 @@ int AutoCorrelate(int window, bool SaveGrph, bool verbose)
   if (verbose && Correlation > 0) PrintAndLog("Possible Correlation: %d samples",Correlation);
 
   if (SaveGrph){
-    GraphTraceLen = GraphTraceLen - window;
-    memcpy(GraphBuffer, CorrelBuffer, GraphTraceLen * sizeof (int));
+  GraphTraceLen = GraphTraceLen - window;
+  memcpy(GraphBuffer, CorrelBuffer, GraphTraceLen * sizeof (int));
     RepaintGraphWindow();  
   }
   return Correlation;
@@ -1098,7 +1118,7 @@ int FSKrawDemod(const char *Cmd, bool verbose)
     if(size > (8*32)+2) size = (8*32)+2; //only output a max of 8 blocks of 32 bits  most tags will have full bit stream inside that sample size
     if (verbose) {
       PrintAndLog("FSK decoded bitstream:");
-      printBitStream(BitStream,size);
+    printBitStream(BitStream,size);
     }
 
     return 1;
@@ -1866,7 +1886,8 @@ int NRZrawDemod(const char *Cmd, bool verbose)
     if (g_debugMode==1 && verbose) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
     return 0;
   }
-  PrintAndLog("Tried NRZ Demod using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen);
+  if (verbose) 
+	PrintAndLog("Tried NRZ Demod using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen);
   //prime demod buffer for output
   setDemodBuf(BitStream,BitLen,0);
 
@@ -1874,9 +1895,9 @@ int NRZrawDemod(const char *Cmd, bool verbose)
     PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);
   }
   if (verbose) {
-    PrintAndLog("NRZ demoded bitstream:");
-    // Now output the bitstream to the scrollback by line of 16 bits
-    printDemodBuff();
+  PrintAndLog("NRZ demoded bitstream:");
+  // Now output the bitstream to the scrollback by line of 16 bits
+  printDemodBuff();
   }
   return 1; 
 }