X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/aadc6bf1e162316eab391ca2ca61d05bdac7db80..b957bcd382bf718f766c0774839752eb99f668af:/client/cmdhflist.c

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index ec710b2c..5ff3192b 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -85,7 +85,10 @@ void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
 {
 	switch(cmd[0])
 	{
-	case ISO14443A_CMD_WUPA:        snprintf(exp,size,"WUPA"); break;
+	case ISO14443A_CMD_WUPA:        
+		snprintf(exp,size,"WUPA"); 
+		MifareAuthState = masNone;
+		break;
 	case ISO14443A_CMD_ANTICOLL_OR_SELECT:{
 		// 93 20 = Anticollision (usage: 9320 - answer: 4bytes UID+1byte UID-bytes-xor)
 		// 93 70 = Select (usage: 9370+5bytes 9320 answer - answer: 1byte SAK)
@@ -108,7 +111,10 @@ void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
 			snprintf(exp,size,"ANTICOLL-2"); break;
 		}
 	}
-	case ISO14443A_CMD_REQA:		snprintf(exp,size,"REQA"); break;
+	case ISO14443A_CMD_REQA:		
+		snprintf(exp,size,"REQA"); 
+		MifareAuthState = masNone;
+		break;
 	case ISO14443A_CMD_READBLOCK:	snprintf(exp,size,"READBLOCK(%d)",cmd[1]); break;
 	case ISO14443A_CMD_WRITEBLOCK:	snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]); break;
 	case ISO14443A_CMD_HALT:		
@@ -180,7 +186,7 @@ void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
 	return;
 }
 
-void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, bool isResponse) {
+void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, uint8_t* parity, uint8_t paritysize, bool isResponse) {
 	// get UID
 	if (MifareAuthState == masNone) {
 		if (cmdsize == 7 && cmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && cmd[1] == 0x70) {
@@ -202,6 +208,7 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, bool
 					AuthData.nt = bytes_to_num(cmd, cmdsize);
 				else
 					AuthData.nt_enc = bytes_to_num(cmd, cmdsize);
+					AuthData.nt_enc_par = parity[0];
 				return;
 			} else {
 				MifareAuthState = masError;
@@ -213,6 +220,7 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, bool
 				MifareAuthState = masAt;
 				AuthData.nr_enc = bytes_to_num(cmd, cmdsize);
 				AuthData.ar_enc = bytes_to_num(&cmd[3], cmdsize);
+				AuthData.ar_enc_par = parity[0] << 4;
 				return;
 			} else {
 				MifareAuthState = masError;
@@ -223,6 +231,7 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, bool
 				snprintf(exp,size,"AUTH: at (enc)");
 				MifareAuthState = masFirstData;
 				AuthData.at_enc = bytes_to_num(cmd, cmdsize);
+				AuthData.at_enc_par = parity[0];
 				return;
 			} else {
 				MifareAuthState = masError;