X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c948cbde8cdb6870daa7df8fef0bef76b8da5333..14006804dd8e68db2a877e0ee588f10a1b178caf:/client/cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index c7f51ed8..1fbeff4a 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1545,7 +1545,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 	// params
 	bool wantLogToFile = 0;
 	bool wantDecrypt = 0;
-	bool wantSaveToEml = 0;
+	//bool wantSaveToEml = 0; TODO
 	bool wantSaveToEmlFile = 0;
 
 	//var 
@@ -1558,6 +1558,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 	uint8_t atqa[2];
 	uint8_t sak;
 	bool isTag;
+	uint32_t parity;
 	uint8_t buf[3000];
 	uint8_t * bufPtr = buf;
 	memset(buf, 0x00, 3000);
@@ -1578,7 +1579,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 		char ctmp = param_getchar(Cmd, i);
 		if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true;
 		if (ctmp == 'd' || ctmp == 'D') wantDecrypt = true;
-		if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true;
+		//if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO
 		if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true;
 	}
 	
@@ -1625,7 +1626,9 @@ int CmdHF14AMfSniff(const char *Cmd){
 				num = 0;
 				while (bufPtr - buf + 9 < blockLen) {
 				  isTag = bufPtr[3] & 0x80 ? true:false;
-					bufPtr += 8;
+					bufPtr += 4;
+					parity = *((uint32_t *)(bufPtr));
+					bufPtr += 4;
 					len = bufPtr[0];
 					bufPtr++;
 					if ((len == 14) && (bufPtr[0] = 0xff) && (bufPtr[1] = 0xff)) {
@@ -1642,7 +1645,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 					} else {
 						PrintAndLog("%s(%d):%s", isTag ? "TAG":"RDR", num, sprint_hex(bufPtr, len));
 						if (wantLogToFile) AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len);
-						if (wantDecrypt) mfTraceDecode(bufPtr, len, wantSaveToEmlFile);
+						if (wantDecrypt) mfTraceDecode(bufPtr, len, parity, wantSaveToEmlFile);
 					}
 					bufPtr += len;
 					num++;