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

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index 8e7b7f6e..43e0e562 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -21,6 +21,8 @@
 #include "iso14443crc.h"
 #include "parity.h"
 #include "protocols.h"
+#include "crapto1/crapto1.h"
+#include "mifarehost.h"
 
 
 enum MifareAuthSeq {
@@ -28,9 +30,9 @@ enum MifareAuthSeq {
 	masNt,
 	masNrAr,
 	masAt,
+	masAuthComplete,
 	masFirstData,
 	masData,
-	masDataNested,
 	masError,
 };
 static enum MifareAuthSeq MifareAuthState;
@@ -39,7 +41,7 @@ static TAuthData AuthData;
 void ClearAuthData() {
 	AuthData.uid = 0;
 	AuthData.nt = 0;
-	AuthData.first_auth = false;
+	AuthData.first_auth = true;
 }
 
 /**
@@ -71,9 +73,6 @@ 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:
 			return iso14443A_CRC_check(isResponse, data, len);
 		default:
@@ -186,14 +185,14 @@ 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) {
+		if (cmdsize == 9 && 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) {
+		if (cmdsize == 9 && cmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT_2 && cmd[1] == 0x70) {
 			ClearAuthData();
 			AuthData.uid = bytes_to_num(&cmd[2], 4);
 		}
@@ -205,9 +204,10 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, bool
 				snprintf(exp,size,"AUTH: nt %s", (AuthData.first_auth) ? "" : "(enc)");
 				MifareAuthState = masNrAr;
 				if (AuthData.first_auth)
-					AuthData.nt = bytes_to_num(cmd, cmdsize);
+					AuthData.nt = bytes_to_num(cmd, 4);
 				else
-					AuthData.nt_enc = bytes_to_num(cmd, cmdsize);
+					AuthData.nt_enc = bytes_to_num(cmd, 4);
+					AuthData.nt_enc_par = parity[0];
 				return;
 			} else {
 				MifareAuthState = masError;
@@ -217,8 +217,9 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, bool
 			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);
+				AuthData.nr_enc = bytes_to_num(cmd, 4);
+				AuthData.ar_enc = bytes_to_num(&cmd[4], 4);
+				AuthData.ar_enc_par = parity[0] << 4;
 				return;
 			} else {
 				MifareAuthState = masError;
@@ -227,8 +228,9 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, bool
 		case masAt:
 			if (cmdsize == 4 && isResponse) {
 				snprintf(exp,size,"AUTH: at (enc)");
-				MifareAuthState = masFirstData;
-				AuthData.at_enc = bytes_to_num(cmd, cmdsize);
+				MifareAuthState = masAuthComplete;
+				AuthData.at_enc = bytes_to_num(cmd, 4);
+				AuthData.at_enc_par = parity[0];
 				return;
 			} else {
 				MifareAuthState = masError;
@@ -238,7 +240,80 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, bool
 			break;
 	}
 	
-	if (!isResponse)
+	if (!isResponse && ((MifareAuthState == masNone) || (MifareAuthState == masError)))
 		annotateIso14443a(exp, size, cmd, cmdsize);
 	
 }
+
+bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, bool isResponse, uint8_t *mfData, size_t *mfDataLen) {
+	static struct Crypto1State *traceCrypto1;	
+	uint64_t mfLastKey;
+	
+	*mfDataLen = 0;
+	
+	if (MifareAuthState == masAuthComplete) {
+		if (traceCrypto1) {
+			crypto1_destroy(traceCrypto1);
+		}
+
+		MifareAuthState = masFirstData;
+		return false;
+	}
+	
+	if (cmdsize > 32)
+		return false;
+	
+	if (MifareAuthState == masFirstData) {
+		if (AuthData.first_auth) {
+			uint32_t ks2 = AuthData.ar_enc ^ prng_successor(AuthData.nt, 64);
+			uint32_t ks3 = AuthData.at_enc ^ prng_successor(AuthData.nt, 96);
+			struct Crypto1State *revstate = lfsr_recovery64(ks2, ks3);
+			lfsr_rollback_word(revstate, 0, 0);
+			lfsr_rollback_word(revstate, 0, 0);
+			lfsr_rollback_word(revstate, AuthData.nr_enc, 1);
+			lfsr_rollback_word(revstate, AuthData.uid ^ AuthData.nt, 0);
+
+			uint64_t lfsr = 0;
+			crypto1_get_lfsr(revstate, &lfsr);
+			crypto1_destroy(revstate);
+			mfLastKey = lfsr;
+			PrintAndLog("            |          * | key | probable key:%x%x Prng:%s   ks2:%08x ks3:%08x |     |", 
+				(unsigned int)((lfsr & 0xFFFFFFFF00000000) >> 32), (unsigned int)(lfsr & 0xFFFFFFFF), 
+				validate_prng_nonce(AuthData.nt) ? "WEAK": "HARD",
+				ks2,
+				ks3);
+			
+			AuthData.first_auth = false;
+
+			traceCrypto1 = lfsr_recovery64(ks2, ks3);
+		} else {
+			printf("uid:%x nt:%x ar_enc:%x at_enc:%x\n", AuthData.uid, AuthData.nt, AuthData.ar_enc, AuthData.at_enc);
+			
+			// check last used key
+			if (mfLastKey) {
+				
+			}
+			
+			// check default keys
+			
+			// nested
+			if (validate_prng_nonce(AuthData.nt)) {
+			}
+			
+			//hardnested
+		}
+		
+		
+		
+		MifareAuthState = masData;
+	}
+	
+	if (MifareAuthState == masData && traceCrypto1) {
+		memcpy(mfData, cmd, cmdsize);
+		mf_crypto1_decrypt(traceCrypto1, mfData, cmdsize, 0);
+		*mfDataLen = cmdsize;
+	}
+	
+	return *mfDataLen > 0;
+}
+