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

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index b1d432ee..065cbde2 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -70,7 +70,6 @@ uint8_t mifare_CRC_check(bool isResponse, uint8_t* data, uint8_t len)
 		default:
 			return 2;
 	}
-
 }
 
 void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
@@ -173,31 +172,43 @@ void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
 }
 
 void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, bool isResponse) {
+//	uint32_t uid;       // UID
+	static uint32_t nt;        // tag challenge
+//	uint32_t nt_enc;    // encrypted tag challenge
+//	uint8_t nt_enc_par; // encrypted tag challenge parity
+	static uint32_t nr_enc;    // encrypted reader challenge
+	static uint32_t ar_enc;    // encrypted reader response
+//	uint8_t ar_enc_par; // encrypted reader response parity
+	static uint32_t at_enc;    // encrypted tag response
+//	uint8_t at_enc_par; // encrypted tag response parity
+
 	switch(MifareAuthState) {
 		case masNt:
-			if (cmdsize == 4) {
-				snprintf(exp,size,"AUTH: nt");
+			if (cmdsize == 4 && isResponse) {
+				snprintf(exp,size,"AUTH: nt %s", (nt) ? "(enc)" : "");
 				MifareAuthState = masNrAr;
-				printf("--ntok\n");
+				nt = bytes_to_num(cmd, cmdsize);
 				return;
 			} else {
 				MifareAuthState = masError;
-				printf("--err %d\n", cmdsize);
 			}
 			break;
 		case masNrAr:
-			if (cmdsize == 8) {
-				snprintf(exp,size,"AUTH: nr ar");
+			if (cmdsize == 8 && !isResponse) {
+				snprintf(exp,size,"AUTH: nr ar (enc)");
 				MifareAuthState = masAt;
+				nr_enc = bytes_to_num(cmd, cmdsize);
+				ar_enc = bytes_to_num(&cmd[3], cmdsize);
 				return;
 			} else {
 				MifareAuthState = masError;
 			}
 			break;
 		case masAt:
-			if (cmdsize == 4) {
-				snprintf(exp,size,"AUTH: at");
+			if (cmdsize == 4 && isResponse) {
+				snprintf(exp,size,"AUTH: at (enc)");
 				MifareAuthState = masData;
+				at_enc = bytes_to_num(cmd, cmdsize);
 				return;
 			} else {
 				MifareAuthState = masError;