X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b2c330b36778471de73683ca779d4850556db895..refs/pull/131/head:/client/cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index dad0a711..bec1b5aa 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -23,6 +23,7 @@
 #include "lfdemod.h"
 #include "usb_cmd.h"
 #include "crc.h"
+#include "crc16.h"
 
 uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
 uint8_t g_debugMode;
@@ -40,7 +41,7 @@ void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx)
 		size = MAX_DEMOD_BUF_LEN;
 
 	size_t i = 0;
-for (; i < size; i++){
+	for (; i < size; i++){
 		DemodBuffer[i]=buff[startIdx++];
 	}
 	DemodBufferLen=size;
@@ -343,8 +344,8 @@ int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType)
 	setDemodBuf(BitStream,BitLen,0);
 	if (verbose || g_debugMode){
 		if (errCnt>0) PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
-		if (askType) PrintAndLog("ASK/Manchester decoded bitstream:");
-		else PrintAndLog("ASK/Raw decoded bitstream:");
+		if (askType) PrintAndLog("ASK/Manchester - Clock: %d - Decoded bitstream:",clk);
+		else PrintAndLog("ASK/Raw - Clock: %d - Decoded bitstream:",clk);
 		// Now output the bitstream to the scrollback by line of 16 bits
 		printDemodBuff();
 		
@@ -391,7 +392,7 @@ int Cmdmandecoderaw(const char *Cmd)
 	int errCnt=0;
 	size_t size=0;
 	int invert=0;
-	size_t maxErr = 20;
+	int maxErr = 20;
 	char cmdp = param_getchar(Cmd, 0);
 	if (strlen(Cmd) > 5 || cmdp == 'h' || cmdp == 'H') {
 		PrintAndLog("Usage:  data manrawdecode [invert] [maxErr]");
@@ -497,22 +498,20 @@ int CmdBiphaseDecodeRaw(const char *Cmd)
 int ASKbiphaseDemod(const char *Cmd, bool verbose)
 {
 	//ask raw demod GraphBuffer first
-	int offset=0, clk=0, invert=0, maxErr=0, ans=0;
-	ans = sscanf(Cmd, "%i %i 0 %i", &offset, &clk, &maxErr);
-	if (ans>0)
-		ans = ASKDemod(Cmd+2, FALSE, FALSE, 0);
-	else
-		ans = ASKDemod(Cmd, FALSE, FALSE, 0);
-	if (!ans) {
-		if (g_debugMode || verbose) PrintAndLog("Error AskDemod: %d", ans);
-		return 0;
-	}
+	int offset=0, clk=0, invert=0, maxErr=0;
+	sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);
+
+	uint8_t BitStream[MAX_DEMOD_BUF_LEN];	  
+	size_t size = getFromGraphBuf(BitStream);	  
+	//invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer
+	int errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0);  
+	if ( errCnt < 0 || errCnt > maxErr ) {   
+		if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk);  
+			return 0;  
+	} 
 
-	//attempt to Biphase decode DemodBuffer
-	size_t size = DemodBufferLen;
-	uint8_t BitStream[MAX_DEMOD_BUF_LEN];
-	memcpy(BitStream, DemodBuffer, DemodBufferLen); 
-	int errCnt = BiphaseRawDecode(BitStream, &size, offset, invert);
+	//attempt to Biphase decode BitStream
+	errCnt = BiphaseRawDecode(BitStream, &size, offset, invert);
 	if (errCnt < 0){
 		if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode: %d", errCnt);
 		return 0;
@@ -524,7 +523,7 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose)
 	//success set DemodBuffer and return
 	setDemodBuf(BitStream, size, 0);
 	if (g_debugMode || verbose){
-		PrintAndLog("Biphase Decoded using offset: %d - # errors:%d - data:",offset,errCnt);
+		PrintAndLog("Biphase Decoded using offset: %d - clock: %d - # errors:%d - data:",offset,clk,errCnt);
 		printDemodBuff();
 	}
 	return 1;
@@ -1474,7 +1473,7 @@ int CmdFDXBdemodBI(const char *Cmd){
 	
 	errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0);
 	if ( errCnt < 0 || errCnt > maxErr ) { 
-		if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: 32", errCnt);
+		if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk);
 		return 0;
 	}
 
@@ -1491,8 +1490,8 @@ int CmdFDXBdemodBI(const char *Cmd){
 	}
 
 	setDemodBuf(BitStream, 128, preambleIndex);
-	//printDemodBuff();
 
+	// remove but don't verify parity. (pType = 2)
 	size = removeParity(BitStream, preambleIndex + 11, 9, 2, 117);
 	if ( size <= 103 ) {
 		if (g_debugMode) PrintAndLog("Error removeParity:: %d", size);
@@ -1503,9 +1502,8 @@ int CmdFDXBdemodBI(const char *Cmd){
 		PrintAndLog("DEBUG BinStream:\n%s",bin);
 	}
 	PrintAndLog("\nFDX-B / ISO 11784/5 Animal Tag ID Found:");
-	if (g_debugMode) PrintAndLog("startmarker %d;   Size %d", preambleIndex, size);
+	if (g_debugMode) PrintAndLog("Start marker %d;   Size %d", preambleIndex, size);
 
-	//return 1;
 	//got a good demod
 	uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(BitStream+32,6)) << 32) | bytebits_to_byteLSBF(BitStream,32);
 	uint32_t countryCode = bytebits_to_byteLSBF(BitStream+38,10);
@@ -1515,14 +1513,21 @@ int CmdFDXBdemodBI(const char *Cmd){
 	uint32_t crc16 = bytebits_to_byteLSBF(BitStream+64,16);
 	uint32_t extended = bytebits_to_byteLSBF(BitStream+80,24);
 
-	PrintAndLog("Animal ID:     %u-%012llu", countryCode, NationalCode);
+	uint64_t rawid = ((uint64_t)bytebits_to_byte(BitStream,32)<<32) | bytebits_to_byte(BitStream+32,32);
+	uint8_t raw[8];
+	num_to_bytes(rawid, 8, raw);
+
+	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("CountryCode:   %u", countryCode);
+	PrintAndLog("CountryCode:   %04u", countryCode);
 	PrintAndLog("Extended Data: %s", dataBlockBit ? "True" : "False");
 	PrintAndLog("reserved Code: %u", reservedCode);
 	PrintAndLog("Animal Tag:    %s", animalBit ? "True" : "False");
-	PrintAndLog("CRC:           0x%02X", crc16);
-	PrintAndLog("Extended:      0x%X", extended);
+	PrintAndLog("CRC:           0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? "Passed" : "Failed");
+	PrintAndLog("Extended:      0x%X\n", extended);
 	
 	return 1;
 }
@@ -1541,12 +1546,12 @@ int PSKDemod(const char *Cmd, bool verbose)
 		clk=0;
 	}
 	if (invert != 0 && invert != 1) {
-		if (verbose) PrintAndLog("Invalid argument: %s", Cmd);
+		if (g_debugMode || verbose) PrintAndLog("Invalid argument: %s", Cmd);
 		return 0;
 	}
 	uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
 	size_t BitLen = getFromGraphBuf(BitStream);
-	if (BitLen==0) return -1;
+	if (BitLen==0) return 0;
 	uint8_t carrier=countFC(BitStream, BitLen, 0);
 	if (carrier!=2 && carrier!=4 && carrier!=8){
 		//invalid carrier