From: Oleg Moiseenko <olegmsn@gmail.com>
Date: Sat, 10 Feb 2018 22:44:24 +0000 (+0200)
Subject: added cipherstream recovery
X-Git-Tag: v3.1.0~70^2~8
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/856da9a1c081abedef9af96220723eb1031f49e2

added cipherstream recovery
---

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index 1701c13a..64ffed5c 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -295,6 +295,7 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, bool isResponse, uint8_t *m
 			// check last used key
 			if (mfLastKey) {
 				if (NestedCheckKey(mfLastKey, &AuthData, cmd, cmdsize)) {
+					traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
 				};
 			}
 			
@@ -302,7 +303,7 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, bool isResponse, uint8_t *m
 			if (!traceCrypto1) {
 				for (int defaultKeyCounter = 0; defaultKeyCounter < MifareDefaultKeysSize; defaultKeyCounter++){
 					if (NestedCheckKey(MifareDefaultKeys[defaultKeyCounter], &AuthData, cmd, cmdsize)) {
-						
+						traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
 						break;
 					};
 				}
@@ -409,5 +410,11 @@ bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize)
 	
 	crypto1_destroy(pcs);
 	
-	return CheckCrc14443(CRC_14443_A, buf, cmdsize);
+	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