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

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index b1d432ee..8e7b7f6e 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -28,11 +28,19 @@ enum MifareAuthSeq {
 	masNt,
 	masNrAr,
 	masAt,
+	masFirstData,
 	masData,
 	masDataNested,
 	masError,
 };
 static enum MifareAuthSeq MifareAuthState;
+static TAuthData AuthData;
+
+void ClearAuthData() {
+	AuthData.uid = 0;
+	AuthData.nt = 0;
+	AuthData.first_auth = false;
+}
 
 /**
  * @brief iso14443A_CRC_check Checks CRC in command or response
@@ -63,6 +71,7 @@ uint8_t mifare_CRC_check(bool isResponse, uint8_t* data, uint8_t len)
 {
 	switch(MifareAuthState) {
 		case masNone:
+		case masFirstData:
 		case masData:
 		case masDataNested:
 		case masError:
@@ -70,14 +79,16 @@ 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)
 {
 	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)
@@ -100,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:		
@@ -173,31 +187,48 @@ 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) {
+	// get UID
+	if (MifareAuthState == masNone) {
+		if (cmdsize == 7 && cmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && cmd[1] == 0x70) {
+			ClearAuthData();
+			AuthData.uid = bytes_to_num(&cmd[2], 4);
+		}
+		if (cmdsize == 7 && cmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 && cmd[1] == 0x70) {
+			ClearAuthData();
+			AuthData.uid = bytes_to_num(&cmd[2], 4);
+		}
+	}
+	
 	switch(MifareAuthState) {
 		case masNt:
-			if (cmdsize == 4) {
-				snprintf(exp,size,"AUTH: nt");
+			if (cmdsize == 4 && isResponse) {
+				snprintf(exp,size,"AUTH: nt %s", (AuthData.first_auth) ? "" : "(enc)");
 				MifareAuthState = masNrAr;
-				printf("--ntok\n");
+				if (AuthData.first_auth)
+					AuthData.nt = bytes_to_num(cmd, cmdsize);
+				else
+					AuthData.nt_enc = 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;
+				AuthData.nr_enc = bytes_to_num(cmd, cmdsize);
+				AuthData.ar_enc = bytes_to_num(&cmd[3], cmdsize);
 				return;
 			} else {
 				MifareAuthState = masError;
 			}
 			break;
 		case masAt:
-			if (cmdsize == 4) {
-				snprintf(exp,size,"AUTH: at");
-				MifareAuthState = masData;
+			if (cmdsize == 4 && isResponse) {
+				snprintf(exp,size,"AUTH: at (enc)");
+				MifareAuthState = masFirstData;
+				AuthData.at_enc = bytes_to_num(cmd, cmdsize);
 				return;
 			} else {
 				MifareAuthState = masError;