From: merlokk <olegmsn@gmail.com>
Date: Fri, 9 Feb 2018 17:40:39 +0000 (+0200)
Subject: added check reader/tag
X-Git-Tag: v3.1.0~70^2~21
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/fb30f5a1013a4e37280c72dda7b37052e317634f

added check reader/tag
---

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index a91df26a..065cbde2 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -184,8 +184,8 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, bool
 
 	switch(MifareAuthState) {
 		case masNt:
-			if (cmdsize == 4) {
-				snprintf(exp,size,"AUTH: nt %s", (MifareAuthState == masData) ? "(enc)" : "");
+			if (cmdsize == 4 && isResponse) {
+				snprintf(exp,size,"AUTH: nt %s", (nt) ? "(enc)" : "");
 				MifareAuthState = masNrAr;
 				nt = bytes_to_num(cmd, cmdsize);
 				return;
@@ -194,7 +194,7 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, bool
 			}
 			break;
 		case masNrAr:
-			if (cmdsize == 8) {
+			if (cmdsize == 8 && !isResponse) {
 				snprintf(exp,size,"AUTH: nr ar (enc)");
 				MifareAuthState = masAt;
 				nr_enc = bytes_to_num(cmd, cmdsize);
@@ -205,7 +205,7 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, bool
 			}
 			break;
 		case masAt:
-			if (cmdsize == 4) {
+			if (cmdsize == 4 && isResponse) {
 				snprintf(exp,size,"AUTH: at (enc)");
 				MifareAuthState = masData;
 				at_enc = bytes_to_num(cmd, cmdsize);