X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a38f5a0704240efdf46ee423f0c9ed10a48b1078..a8fd088d8b142520fbb686b315df7216a81d481f:/client/cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index ece0810d..398d31fb 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -364,95 +364,98 @@ int CmdGetBitStream(const char *Cmd)
 //print 64 bit EM410x ID in multiple formats
 void printEM410x(uint32_t hi, uint64_t id)
 {
-	if (id || hi){
-		uint64_t iii=1;
-		uint64_t id2lo=0;
-		uint32_t ii=0;
-		uint32_t i=0;
-		for (ii=5; ii>0;ii--){
-			for (i=0;i<8;i++){
-				id2lo=(id2lo<<1LL) | ((id & (iii << (i+((ii-1)*8)))) >> (i+((ii-1)*8)));
-			}
+	if (!id && !hi) return;
+	
+	PrintAndLog("EM410x %s pattern found", (hi) ? "XL" : "" );
+
+	uint64_t iii=1;
+	uint64_t id2lo=0;
+	uint32_t ii=0;
+	uint32_t i=0;
+	for (ii=5; ii>0;ii--){
+		for (i=0;i<8;i++){
+			id2lo=(id2lo<<1LL) | ((id & (iii << (i+((ii-1)*8)))) >> (i+((ii-1)*8)));
 		}
-		if (hi){
-			//output 88 bit em id
-			PrintAndLog("\nEM TAG ID      : %06X%016llX", hi, id);
-		} else{
-			//output 40 bit em id
-			PrintAndLog("\nEM TAG ID      : %010llX", id);
-			PrintAndLog("Unique TAG ID  : %010llX",  id2lo);
-			PrintAndLog("\nPossible de-scramble patterns");
-			PrintAndLog("HoneyWell IdentKey {");
-			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("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)
-			);
-			uint64_t paxton = (((id>>32) << 24) | (id & 0xffffff))  + 0x143e00;
-			PrintAndLog("}\nOther          : %05lld_%03lld_%08lld",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF));  
-			PrintAndLog("Pattern Paxton : %lld [0x%llX]", paxton, paxton);
-
-			uint32_t p1id = (id & 0xFFFFFF);
-			uint8_t arr[32] = {0x00};
-			int i =0; 
-			int j = 23;
-			for (; i < 24; ++i, --j	){
-				arr[i] = (p1id >> i) & 1;
-			}
-
-			uint32_t p1  = 0;
-
-			p1 |= arr[23] << 21;
-			p1 |= arr[22] << 23;
-			p1 |= arr[21] << 20;
-			p1 |= arr[20] << 22;
-				
-			p1 |= arr[19] << 18;
-			p1 |= arr[18] << 16;
-			p1 |= arr[17] << 19;
-			p1 |= arr[16] << 17;
-				
-			p1 |= arr[15] << 13;
-			p1 |= arr[14] << 15;
-			p1 |= arr[13] << 12;
-			p1 |= arr[12] << 14;
-
-			p1 |= arr[11] << 6;
-			p1 |= arr[10] << 2;
-			p1 |= arr[9]  << 7;
-			p1 |= arr[8]  << 1;
-
-			p1 |= arr[7]  << 0;
-			p1 |= arr[6]  << 8;
-			p1 |= arr[5]  << 11;
-			p1 |= arr[4]  << 3;
-
-			p1 |= arr[3]  << 10;
-			p1 |= arr[2]  << 4;
-			p1 |= arr[1]  << 5;
-			p1 |= arr[0]  << 9;
-			PrintAndLog("Pattern 1      : %d [0x%X]", p1, p1);
-
-			uint16_t sebury1 = id & 0xFFFF;
-			uint8_t  sebury2 = (id >> 16) & 0x7F;
-			uint32_t sebury3 = id & 0x7FFFFF;
-			PrintAndLog("Pattern Sebury : %d %d %d  [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3);
+	}
+	
+	if (hi){
+		//output 88 bit em id
+		PrintAndLog("\nEM TAG ID      : %06X%016" PRIX64, hi, id);
+	} else{
+		//output 40 bit em id
+		PrintAndLog("\nEM TAG ID      : %010" PRIX64, id);
+		PrintAndLog("\nPossible de-scramble patterns");
+		PrintAndLog("Unique TAG ID  : %010" PRIX64, id2lo);
+		PrintAndLog("HoneyWell IdentKey {");
+		PrintAndLog("DEZ 8          : %08" PRIu64, id & 0xFFFFFF);
+		PrintAndLog("DEZ 10         : %010" PRIu64, id & 0xFFFFFFFF);
+		PrintAndLog("DEZ 5.5        : %05" PRIu64 ".%05" PRIu64, (id>>16LL) & 0xFFFF, (id & 0xFFFF));
+		PrintAndLog("DEZ 3.5A       : %03" PRIu64 ".%05" PRIu64, (id>>32ll), (id & 0xFFFF));
+		PrintAndLog("DEZ 3.5B       : %03" PRIu64 ".%05" PRIu64, (id & 0xFF000000) >> 24, (id & 0xFFFF));
+		PrintAndLog("DEZ 3.5C       : %03" PRIu64 ".%05" PRIu64, (id & 0xFF0000) >> 16, (id & 0xFFFF));
+		PrintAndLog("DEZ 14/IK2     : %014" PRIu64, id);
+		PrintAndLog("DEZ 15/IK3     : %015" PRIu64, id2lo);
+		PrintAndLog("DEZ 20/ZK      : %02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64,
+			(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)
+		);
+		uint64_t paxton = (((id>>32) << 24) | (id & 0xffffff))  + 0x143e00;
+		PrintAndLog("}\nOther          : %05" PRIu64 "_%03" PRIu64 "_%08" PRIu64, (id&0xFFFF), ((id>>16LL) & 0xFF), (id & 0xFFFFFF));  
+		PrintAndLog("Pattern Paxton : %" PRIu64 " [0x%" PRIX64 "]", paxton, paxton);
+
+		uint32_t p1id = (id & 0xFFFFFF);
+		uint8_t arr[32] = {0x00};
+		int i =0; 
+		int j = 23;
+		for (; i < 24; ++i, --j	){
+			arr[i] = (p1id >> i) & 1;
 		}
+
+		uint32_t p1  = 0;
+
+		p1 |= arr[23] << 21;
+		p1 |= arr[22] << 23;
+		p1 |= arr[21] << 20;
+		p1 |= arr[20] << 22;
+			
+		p1 |= arr[19] << 18;
+		p1 |= arr[18] << 16;
+		p1 |= arr[17] << 19;
+		p1 |= arr[16] << 17;
+			
+		p1 |= arr[15] << 13;
+		p1 |= arr[14] << 15;
+		p1 |= arr[13] << 12;
+		p1 |= arr[12] << 14;
+
+		p1 |= arr[11] << 6;
+		p1 |= arr[10] << 2;
+		p1 |= arr[9]  << 7;
+		p1 |= arr[8]  << 1;
+
+		p1 |= arr[7]  << 0;
+		p1 |= arr[6]  << 8;
+		p1 |= arr[5]  << 11;
+		p1 |= arr[4]  << 3;
+
+		p1 |= arr[3]  << 10;
+		p1 |= arr[2]  << 4;
+		p1 |= arr[1]  << 5;
+		p1 |= arr[0]  << 9;
+		PrintAndLog("Pattern 1      : %d [0x%X]", p1, p1);
+
+		uint16_t sebury1 = id & 0xFFFF;
+		uint8_t  sebury2 = (id >> 16) & 0x7F;
+		uint32_t sebury3 = id & 0x7FFFFF;
+		PrintAndLog("Pattern Sebury : %d %d %d  [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3);
 	}
 	return;
 }
@@ -468,26 +471,30 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo )
 		if (g_debugMode){
 			if (ans == -1)
 				PrintAndLog("DEBUG: Error - Em410x not only 0|1 in decoded bitstream");
+			else if (ans == -2)
+				PrintAndLog("DEBUG: Error - Em410x preamble not found");
 			else if (ans == -3)
 				PrintAndLog("DEBUG: Error - Em410x Size not correct: %d", size);
 			else if (ans == -4)
-				PrintAndLog("DEBUG: Error - Em410x preamble not found");
-			else if (ans == -5)
 				PrintAndLog("DEBUG: Error - Em410x parity failed");
 		}
 		return 0;
 	}
-	
+	if (!lo && !hi) {
+		PrintAndLog("DEBUG: Error - Em410x decoded to all zeros");
+		return 0;
+	}
+		
 	//set GraphBuffer for clone or sim command
 	setDemodBuf(BitStream, size, idx);
 	if (g_debugMode){
 		PrintAndLog("DEBUG: Em410x idx: %d, Len: %d, Printing Demod Buffer:", idx, size);
 		printDemodBuff();
 	}
-	if (verbose){
-		PrintAndLog("EM410x pattern found: ");
+	
+	if (verbose)
 		printEM410x(*hi, *lo);
-	}
+
 	return 1;
 }
 
@@ -542,9 +549,9 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 	if (maxLen<BitLen && maxLen != 0) BitLen = maxLen;
 	int foundclk = 0;
 	//amp before ST check
-	if (amp == 'a' || amp == 'A') {
+	if (amp == 'a' || amp == 'A')
 		askAmp(BitStream, BitLen); 
-	}
+
 	bool st = false;
 	if (*stCheck) st = DetectST(BitStream, &BitLen, &foundclk);
 	if (st) {
@@ -552,6 +559,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 		clk = (clk == 0) ? foundclk : clk;
 		if (verbose || g_debugMode) PrintAndLog("\nFound Sequence Terminator");
 	}
+		
 	int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, 0, askType);
 	if (errCnt<0 || BitLen<16){  //if fatal error (or -1)
 		if (g_debugMode) PrintAndLog("DEBUG: no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk);
@@ -1734,8 +1742,8 @@ int CmdFDXBdemodBI(const char *Cmd){
 	if (g_debugMode) PrintAndLog("Raw ID Hex: %s", sprint_hex(raw,8));
 
 	uint16_t calcCrc = crc16_ccitt_kermit(raw, 8);
-	PrintAndLog("Animal ID:     %04u-%012llu", countryCode, NationalCode);
-	PrintAndLog("National Code: %012llu", NationalCode);
+	PrintAndLog("Animal ID:     %04u-%012" PRIu64, countryCode, NationalCode);
+	PrintAndLog("National Code: %012" PRIu64, NationalCode);
 	PrintAndLog("CountryCode:   %04u", countryCode);
 
 	PrintAndLog("Reserved/RFU:      %u", reservedCode);
@@ -1756,9 +1764,7 @@ int CmdFDXBdemodBI(const char *Cmd){
 //attempt to psk1 demod graph buffer
 int PSKDemod(const char *Cmd, bool verbose)
 {
-	int invert=0;
-	int clk=0;
-	int maxErr=100;
+	int invert = 0, clk = 0, maxErr = 100;
 	sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
 	if (clk==1){
 		invert=1;
@@ -1768,25 +1774,26 @@ int PSKDemod(const char *Cmd, bool verbose)
 		if (g_debugMode || verbose) PrintAndLog("Invalid argument: %s", Cmd);
 		return 0;
 	}
-	uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+	uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
 	size_t BitLen = getFromGraphBuf(BitStream);
 	if (BitLen==0) return 0;
-	uint8_t carrier=countFC(BitStream, BitLen, 0);
+	
+	uint8_t carrier = countFC(BitStream, BitLen, 0);
 	if (carrier!=2 && carrier!=4 && carrier!=8){
 		//invalid carrier
 		return 0;
 	}
-	if (g_debugMode){
-		PrintAndLog("Carrier: rf/%d",carrier);
-	}
+	
+	if (g_debugMode) PrintAndLog("Carrier: rf/%d",carrier);
+
 	int errCnt=0;
 	errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);
 	if (errCnt > maxErr){
-		if (g_debugMode || verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
+		if (g_debugMode || verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
 		return 0;
 	} 
 	if (errCnt<0|| BitLen<16){  //throw away static - allow 1 and -1 (in case of threshold command first)
-		if (g_debugMode || verbose) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
+		if (g_debugMode || verbose) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);
 		return 0;
 	}
 	if (verbose || g_debugMode){
@@ -1796,7 +1803,7 @@ int PSKDemod(const char *Cmd, bool verbose)
 		}
 	}
 	//prime demod buffer for output
-	setDemodBuf(BitStream,BitLen,0);
+	setDemodBuf(BitStream, BitLen, 0);
 	return 1;
 }