X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/dca8220f729d7855b12c89ecb402958ce6dbc81b..856da9a1c081abedef9af96220723eb1031f49e2:/client/cmdhflist.c

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index dc3d9640..64ffed5c 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -43,6 +43,8 @@ void ClearAuthData() {
 	AuthData.uid = 0;
 	AuthData.nt = 0;
 	AuthData.first_auth = true;
+	AuthData.ks2 = 0;
+	AuthData.ks3 = 0;
 }
 
 /**
@@ -266,9 +268,9 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, bool isResponse, uint8_t *m
 	
 	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);
+			AuthData.ks2 = AuthData.ar_enc ^ prng_successor(AuthData.nt, 64);
+			AuthData.ks3 = AuthData.at_enc ^ prng_successor(AuthData.nt, 96);
+			struct Crypto1State *revstate = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
 			lfsr_rollback_word(revstate, 0, 0);
 			lfsr_rollback_word(revstate, 0, 0);
 			lfsr_rollback_word(revstate, AuthData.nr_enc, 1);
@@ -281,34 +283,63 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, bool isResponse, uint8_t *m
 			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.ks2,
+				AuthData.ks3);
 			
 			AuthData.first_auth = false;
 
-			traceCrypto1 = lfsr_recovery64(ks2, ks3);
+			traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.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) {
 				if (NestedCheckKey(mfLastKey, &AuthData, cmd, cmdsize)) {
+					traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
 				};
 			}
 			
 			// check default keys
-			for (int defaultKeyCounter = 0; defaultKeyCounter < MifareDefaultKeysSize; defaultKeyCounter++){
-				if (NestedCheckKey(MifareDefaultKeys[defaultKeyCounter], &AuthData, cmd, cmdsize)) {
-					
-					break;
-				};
+			if (!traceCrypto1) {
+				for (int defaultKeyCounter = 0; defaultKeyCounter < MifareDefaultKeysSize; defaultKeyCounter++){
+					if (NestedCheckKey(MifareDefaultKeys[defaultKeyCounter], &AuthData, cmd, cmdsize)) {
+						traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
+						break;
+					};
+				}
 			}
 			
 			// nested
-			if (validate_prng_nonce(AuthData.nt)) {
+			if (!traceCrypto1 && validate_prng_nonce(AuthData.nt)) {
+				uint32_t ntx = prng_successor(AuthData.nt, 90);
+				for (int i = 0; i < 16383; i++) {
+					ntx = prng_successor(ntx, 1);
+					if (NTParityChk(&AuthData, ntx)){
+
+						uint32_t ks2 = AuthData.ar_enc ^ prng_successor(ntx, 64);
+						uint32_t ks3 = AuthData.at_enc ^ prng_successor(ntx, 96);
+						struct Crypto1State *pcs = lfsr_recovery64(ks2, ks3);
+						memcpy(mfData, cmd, cmdsize);
+						mf_crypto1_decrypt(pcs, mfData, cmdsize, 0);
+				
+						crypto1_destroy(pcs);
+						if (CheckCrc14443(CRC_14443_A, mfData, cmdsize)) {
+							AuthData.ks2 = ks2;
+							AuthData.ks3 = ks3;
+							traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
+							break;
+						}
+					}						
+				}
+				if (traceCrypto1)
+					printf("key> nt=%08x nonce distance=%d \n", ntx, nonce_distance(AuthData.nt, ntx));
+				else
+					printf("key> don't have any valid nt( \n");					
 			}
 			
 			//hardnested
+			if (!traceCrypto1) {
+			}
 		}
 		
 		
@@ -377,5 +408,13 @@ bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize)
 	memcpy(buf, cmd, cmdsize);
 	mf_crypto1_decrypt(pcs, buf, cmdsize, 0);
 	
-	return CheckCrc14443(CRC_14443_A, buf, cmdsize);
+	crypto1_destroy(pcs);
+	
+	if(CheckCrc14443(CRC_14443_A, buf, cmdsize)) {
+		AuthData.ks2 = AuthData.ar_enc ^ ar;
+		AuthData.ks3 = AuthData.at_enc ^ at;
+		return true;
+	} else {
+		return false;
+	}
 }
\ No newline at end of file