X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/bb522918374599054615270d45b1baeaef6f3d66..2d3f8e5fa7e5a775cef24b526a85465cd7d125b5:/client/cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index c583aa3f..ece0810d 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -328,6 +328,11 @@ int CmdPrintDemodBuff(const char *Cmd)
 	}
 	//Validations
 	if(errors) return usage_data_printdemodbuf();
+	
+	if (DemodBufferLen == 0) {
+		PrintAndLog("Demodbuffer is empty");
+		return 0;
+	}
 	length = (length > (DemodBufferLen-offset)) ? DemodBufferLen-offset : length; 
 	int numBits = (length) & 0x00FFC; //make sure we don't exceed our string
 
@@ -519,7 +524,6 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 	int clk = 0;
 	int maxErr = 100;
 	int maxLen = 0;
-	uint8_t askAmp = 0;
 	char amp = param_getchar(Cmd, 0);
 	uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
 	sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &amp);
@@ -532,12 +536,15 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 		invert=1;
 		clk=0;
 	}
-	if (amp == 'a' || amp == 'A') askAmp=1; 
 	size_t BitLen = getFromGraphBuf(BitStream);
-	if (g_debugMode) PrintAndLog("DEBUG: Bitlen from grphbuff: %d",BitLen);
+	if (g_debugMode) PrintAndLog("DEBUG: Bitlen from grphbuff: %d", BitLen);
 	if (BitLen<255) return 0;
 	if (maxLen<BitLen && maxLen != 0) BitLen = maxLen;
 	int foundclk = 0;
+	//amp before ST check
+	if (amp == 'a' || amp == 'A') {
+		askAmp(BitStream, BitLen); 
+	}
 	bool st = false;
 	if (*stCheck) st = DetectST(BitStream, &BitLen, &foundclk);
 	if (st) {
@@ -545,12 +552,12 @@ 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, askAmp, askType);
+	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);
 		return 0;
 	}
-	if (errCnt>maxErr){
+	if (errCnt > maxErr){
 		if (g_debugMode) PrintAndLog("DEBUG: Too many errors found, errors:%d, bits:%d, clock:%d",errCnt, BitLen, clk);
 		return 0;
 	}
@@ -587,7 +594,7 @@ int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {
 int Cmdaskmandemod(const char *Cmd)
 {
 	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_am();
+	if (strlen(Cmd) > 45 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_am();
 
 	bool st = TRUE;
 	if (Cmd[0]=='s') 
@@ -628,8 +635,8 @@ int Cmdmandecoderaw(const char *Cmd)
 	}
 
 	sscanf(Cmd, "%i %i", &invert, &maxErr);
-	size=i;
-	errCnt=manrawdecode(BitStream, &size, invert);
+	size = i;
+	errCnt = manrawdecode(BitStream, &size, invert);
 	if (errCnt >= maxErr){
 		PrintAndLog("Too many errors: %d",errCnt);
 		return 0;
@@ -778,8 +785,8 @@ int CmdG_Prox_II_Demod(const char *Cmd)
 		ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer+8 + (idx*8),8)) ^ xorKey;
 		if (g_debugMode) PrintAndLog("DEBUG: gProxII byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]);
 	}
-	//now ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
-	// 
+	
+	//ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
 	uint8_t fmtLen = ByteStream[0]>>2;
 	uint32_t FC = 0;
 	uint32_t Card = 0;
@@ -787,20 +794,25 @@ int CmdG_Prox_II_Demod(const char *Cmd)
 	uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans,32);
 	uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32);
 	uint32_t raw3 = bytebits_to_byte(DemodBuffer+ans+64, 32);
-
-	if (fmtLen==36){
-		FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
-		Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
-		PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card);
-	} else if(fmtLen==26){
-		FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);
-		Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);
-		PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card);
-	} else {
-		PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",(int)fmtLen);
-		PrintAndLog("Decoded Raw: %s", sprint_hex(ByteStream, 8)); 
+	bool unknown = FALSE;
+	switch(fmtLen) {
+		case 36:
+			FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
+			Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
+			break;
+		case 26: 
+			FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);
+			Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);
+			break;
+		default :
+			unknown = TRUE;
+			break;
 	}
-	PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3);
+	if ( !unknown)
+		PrintAndLog("G-Prox-II Found: Format Len: %ubit - FC: %u - Card: %u, Raw: %08x%08x%08x", fmtLen, FC, Card, raw1, raw2, raw3);
+	else
+		PrintAndLog("Unknown G-Prox-II Fmt Found: Format Len: %u, Raw: %08x%08x%08x", fmtLen, raw1, raw2, raw3);
+
 	setDemodBuf(DemodBuffer+ans, 96, 0);
 	return 1;
 }
@@ -1142,7 +1154,7 @@ int FSKrawDemod(const char *Cmd, bool verbose)
 int CmdFSKrawdemod(const char *Cmd)
 {
 	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_fs();
+	if (strlen(Cmd) > 20 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_fs();
 
 	return FSKrawDemod(Cmd, TRUE);
 }
@@ -1991,7 +2003,7 @@ int NRZrawDemod(const char *Cmd, bool verbose)
 int CmdNRZrawDemod(const char *Cmd)
 {
 	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_nr();
+	if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_nr();
 
 	return NRZrawDemod(Cmd, TRUE);
 }
@@ -2004,7 +2016,7 @@ int CmdPSK1rawDemod(const char *Cmd)
 {
 	int ans;
 	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_p1();
+	if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_p1();
 
 	ans = PSKDemod(Cmd, TRUE);
 	//output
@@ -2024,7 +2036,7 @@ int CmdPSK2rawDemod(const char *Cmd)
 {
 	int ans = 0;
 	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H')	return usage_data_rawdemod_p2();
+	if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H')	return usage_data_rawdemod_p2();
 
 	ans = PSKDemod(Cmd, TRUE);
 	if (!ans){
@@ -2045,7 +2057,7 @@ int CmdRawDemod(const char *Cmd)
 	char cmdp2 = Cmd[1];
 	int ans = 0;
 
-	if (strlen(Cmd) > 20 || cmdp == 'h' || cmdp == 'H' || strlen(Cmd) < 2)
+	if (strlen(Cmd) > 35 || cmdp == 'h' || cmdp == 'H' || strlen(Cmd) < 2)
 		return usage_data_rawdemod();
 
 	if (cmdp == 'f' && cmdp2 == 's')
@@ -2256,7 +2268,7 @@ int CmdTuneSamples(const char *Cmd)
 		PrintAndLog("# LF antenna: %5.2f V @   125.00 kHz", vLf125/1000.0);
 	if ( vLf134 > NON_VOLTAGE )
 		PrintAndLog("# LF antenna: %5.2f V @   134.00 kHz", vLf134/1000.0);
-	if ( peakv > NON_VOLTAGE && peakf > NON_VOLTAGE )
+	if ( peakv > NON_VOLTAGE && peakf > 0 )
 		PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));
 	if ( vHf > NON_VOLTAGE )
 		PrintAndLog("# HF antenna: %5.2f V @    13.56 MHz", vHf/1000.0);
@@ -2306,10 +2318,9 @@ int CmdLoad(const char *Cmd)
 		GraphBuffer[GraphTraceLen] = atoi(line);
 		GraphTraceLen++;
 	}
-	if (f) {
+	if (f)
 		fclose(f);
-		f = NULL;
-	}
+
 	PrintAndLog("loaded %d samples", GraphTraceLen);
 	RepaintGraphWindow();
 	return 0;
@@ -2382,10 +2393,9 @@ int CmdSave(const char *Cmd)
 	for (int i = 0; i < GraphTraceLen; i++)
 		fprintf(f, "%d\n", GraphBuffer[i]);
 
-	if (f) {
+	if (f)
 		fclose(f);
-		f = NULL;
-	}
+
 	PrintAndLog("saved to '%s'", Cmd);
 	return 0;
 }