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

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index a91df26a..5ff3192b 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:
@@ -76,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)
@@ -99,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:		
@@ -171,44 +186,52 @@ 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) {
-//	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
-
+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) {
+			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 %s", (MifareAuthState == masData) ? "(enc)" : "");
+			if (cmdsize == 4 && isResponse) {
+				snprintf(exp,size,"AUTH: nt %s", (AuthData.first_auth) ? "" : "(enc)");
 				MifareAuthState = masNrAr;
-				nt = bytes_to_num(cmd, cmdsize);
+				if (AuthData.first_auth)
+					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;
 			}
 			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);
-				ar_enc = bytes_to_num(&cmd[3], cmdsize);
+				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;
 			}
 			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);
+				MifareAuthState = masFirstData;
+				AuthData.at_enc = bytes_to_num(cmd, cmdsize);
+				AuthData.at_enc_par = parity[0];
 				return;
 			} else {
 				MifareAuthState = masError;