X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/33a1fe9636ddc00cedfec34e0d8a77899ca4494c..62a38cc8835cc7b98a30ee3e670e6eb582ddd8cd:/client/cmdlfem4x.c

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 0788b138..f9103126 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -63,6 +63,20 @@ int CmdEM410xRead(const char *Cmd)
 	return 1;
 }
 
+int usage_lf_em410x_sim(void) {
+	PrintAndLog("Simulating EM410x tag");
+	PrintAndLog("");
+	PrintAndLog("Usage:  lf em 410xsim [h] <uid> <clock>");
+	PrintAndLog("Options:");
+	PrintAndLog("       h         - this help");
+	PrintAndLog("       uid       - uid (10 HEX symbols)");
+	PrintAndLog("       clock     - clock (32|64) (optional)");
+	PrintAndLog("samples:");
+	PrintAndLog("      lf em 410xsim 0F0368568B");
+	PrintAndLog("      lf em 410xsim 0F0368568B 32");
+	return 0;
+}
+
 // emulate an EM410X tag
 int CmdEM410xSim(const char *Cmd)
 {
@@ -71,12 +85,7 @@ int CmdEM410xSim(const char *Cmd)
 	char cmdp = param_getchar(Cmd, 0);
 	uint8_t uid[5] = {0x00};
 
-	if (cmdp == 'h' || cmdp == 'H') {
-		PrintAndLog("Usage:  lf em 410xsim <UID> <clock>");
-		PrintAndLog("");
-		PrintAndLog("     sample: lf em 410xsim 0F0368568B");
-		return 0;
-	}
+	if (cmdp == 'h' || cmdp == 'H') return usage_lf_em410x_sim();
 	/* clock is 64 in EM410x tags */
 	uint8_t clock = 64;
 
@@ -174,7 +183,7 @@ int CmdEM410xWrite(const char *Cmd)
 	int card = 0xFF; // invalid card value
 	unsigned int clock = 0; // invalid clock value
 
-	sscanf(Cmd, "%" PRIx64 " %d %d", &id, &card, &clock);
+	sscanf(Cmd, "%" SCNx64 " %d %d", &id, &card, &clock);
 
 	// Check ID
 	if (id == 0xFFFFFFFFFFFFFFFF) {
@@ -540,7 +549,7 @@ bool EM4x05testDemodReadData(uint32_t *word, bool readCmd) {
 	// sanity check
 	size = (size > DemodBufferLen) ? DemodBufferLen : size;
 	// test preamble
-	if ( !onePreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx) ) {
+	if ( !preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx, true) ) {
 		if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
 		return false;
 	}
@@ -550,13 +559,13 @@ bool EM4x05testDemodReadData(uint32_t *word, bool readCmd) {
 			if (g_debugMode) PrintAndLog("DEBUG: Error - End Parity check failed");
 			return false;
 		}
-		// test for even parity bits.
-		if ( removeParity(DemodBuffer, startIdx + sizeof(preamble),9,0,44) == 0 ) {		
+		// test for even parity bits and remove them. (leave out the end row of parities so 36 bits)
+		if ( removeParity(DemodBuffer, startIdx + sizeof(preamble),9,0,36) == 0 ) {		
 			if (g_debugMode) PrintAndLog("DEBUG: Error - Parity not detected");
 			return false;
 		}
 
-		setDemodBuf(DemodBuffer, 40, 0);
+		setDemodBuf(DemodBuffer, 32, 0);
 		*word = bytebits_to_byteLSBF(DemodBuffer, 32);
 	}
 	return true;