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

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index dc3d9640..06bd8d18 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -297,18 +297,44 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, bool isResponse, uint8_t *m
 			}
 			
 			// 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)) {
+						
+						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)) {
+							traceCrypto1 = lfsr_recovery64(ks2, 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 +403,7 @@ bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize)
 	memcpy(buf, cmd, cmdsize);
 	mf_crypto1_decrypt(pcs, buf, cmdsize, 0);
 	
+	crypto1_destroy(pcs);
+	
 	return CheckCrc14443(CRC_14443_A, buf, cmdsize);
 }
\ No newline at end of file