X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7314995a5a3979452d5a104dc243460dfa945ffd..c872d8c1773591e976a508755ce43664f4083da6:/client/nonce2key/nonce2key.c

diff --git a/client/nonce2key/nonce2key.c b/client/nonce2key/nonce2key.c
index 9abc814b..3750366b 100644
--- a/client/nonce2key/nonce2key.c
+++ b/client/nonce2key/nonce2key.c
@@ -151,22 +151,24 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
 }
 
 // 32 bit recover key from 2 nonces
-uint64_t mfkey32(uint32_t uid, uint32_t nt, uint32_t nr0_enc, uint32_t ar0_enc, uint32_t nr1_enc, uint32_t ar1_enc) {
+bool mfkey32(nonces_t data, uint64_t *outputkey) {
 	struct Crypto1State *s,*t;
+	uint64_t outkey = 0;
 	uint64_t key=0;     // recovered key
-	/*uint32_t uid;     // serial number
-	uint32_t nt;      // tag challenge
-	uint32_t nr0_enc; // first encrypted reader challenge
-	uint32_t ar0_enc; // first encrypted reader response
-	uint32_t nr1_enc; // second encrypted reader challenge
-	uint32_t ar1_enc; // second encrypted reader response
- */
-	uint8_t found=0;
-	//uint32_t ks2;     // keystream used to encrypt reader response
-
+	uint32_t uid     = data.cuid;
+	uint32_t nt      = data.nonce;  // first tag challenge (nonce)
+	uint32_t nr0_enc = data.nr;  // first encrypted reader challenge
+	uint32_t ar0_enc = data.ar;  // first encrypted reader response
+	uint32_t nr1_enc = data.nr2; // second encrypted reader challenge
+	uint32_t ar1_enc = data.ar2; // second encrypted reader response
+	clock_t t1 = clock();
+	bool isSuccess = FALSE;
+	uint8_t counter=0;
+	//PrintAndLog("Enter mfkey32");
+	//PrintAndLog("Trying sector %d, cuid %08x, nt %08x, nr %08x, ar %08x, nr2 %08x, ar2 %08x",data.sector, uid, nt,nr0_enc,ar0_enc,nr1_enc,ar1_enc);
 	// Generate lfsr succesors of the tag challenge
-	prng_successor(nt, 64);
-	prng_successor(nt, 96);
+	//prng_successor(nt, 64);
+	//prng_successor(nt, 96);
 
 	// Extract the keystream from the messages
 	//ks2 = ar0_enc ^ prng_successor(nt, 64);
@@ -181,13 +183,112 @@ uint64_t mfkey32(uint32_t uid, uint32_t nt, uint32_t nr0_enc, uint32_t ar0_enc,
 		crypto1_word(t, uid ^ nt, 0);
 		crypto1_word(t, nr1_enc, 1);
 		if (ar1_enc == (crypto1_word(t, 0, 0) ^ prng_successor(nt, 64))) {
-			//printf("\nFound Key: [%012"llx"]\n\n",key);
-			found = 1;
-			break;
+			//PrintAndLog("Found Key: [%012"llx"]",key);
+			outkey = key;
+			counter++;
+			if (counter==20) break;
 		}
 	}
-	free(s);
+	//free(s);
+	isSuccess = (counter == 1);
+	t1 = clock() - t1;
+	//if ( t1 > 0 ) PrintAndLog("Time in mfkey32: %.0f ticks \nFound %d possible keys", (float)t1, counter);
+	*outputkey = ( isSuccess ) ? outkey : 0;
+	crypto1_destroy(s);
+	FILE *fout;
+	if ((fout = fopen("stats.txt","ab")) == NULL) { 
+		PrintAndLog("Could not create file name stats.txt");
+		return 1;
+	}
+	fprintf(fout, "mfkey32,%d,%d,%s,%04x%08x,%.0Lf\r\n",counter,data.sector,(data.keytype) ? "B" : "A", (uint32_t)(outkey>>32) & 0xFFFF,(uint32_t)(outkey&0xFFFFFFFF),(long double)t1);
+	fclose(fout);
+	return isSuccess;
+}
 
-	if (found) return key;
+bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) {
+	struct Crypto1State *s, *t;
+	uint64_t outkey  = 0;
+	uint64_t key 	   = 0;			     // recovered key
+	uint32_t uid     = data.cuid;
+	uint32_t nt0     = data.nonce;  // first tag challenge (nonce)
+	uint32_t nr0_enc = data.nr;  // first encrypted reader challenge
+	uint32_t ar0_enc = data.ar; // first encrypted reader response
+	//uint32_t uid1    = le32toh(data+16);
+	uint32_t nt1     = data.nonce2; // second tag challenge (nonce)
+	uint32_t nr1_enc = data.nr2; // second encrypted reader challenge
+	uint32_t ar1_enc = data.ar2; // second encrypted reader response	
+	bool isSuccess = FALSE;
+	int counter = 0;
+	
+	//PrintAndLog("Enter mfkey32_moebius");
+	clock_t t1 = clock();
+
+	s = lfsr_recovery32(ar0_enc ^ prng_successor(nt0, 64), 0);
+  
+	for(t = s; t->odd | t->even; ++t) {
+		lfsr_rollback_word(t, 0, 0);
+		lfsr_rollback_word(t, nr0_enc, 1);
+		lfsr_rollback_word(t, uid ^ nt0, 0);
+		crypto1_get_lfsr(t, &key);
+		
+		crypto1_word(t, uid ^ nt1, 0);
+		crypto1_word(t, nr1_enc, 1);
+		if (ar1_enc == (crypto1_word(t, 0, 0) ^ prng_successor(nt1, 64))) {
+			//PrintAndLog("Found Key: [%012"llx"]",key);
+			outkey=key;
+			++counter;
+			if (counter==20)
+				break;
+		}
+	}
+	isSuccess	= (counter == 1);
+	t1 = clock() - t1;
+	//if ( t1 > 0 ) PrintAndLog("Time in mfkey32_moebius: %.0f ticks \nFound %d possible keys", (float)t1,counter);
+	*outputkey = ( isSuccess ) ? outkey : 0;
+	crypto1_destroy(s);
+	FILE *fout;
+	if ((fout = fopen("stats.txt","ab")) == NULL) { 
+		PrintAndLog("Could not create file name stats.txt");
+		return 1;
+	}
+	fprintf(fout, "moebius,%d,%d,%s,%04x%08x,%0.Lf\r\n",counter,data.sector, (data.keytype) ? "B" : "A", (uint32_t) (outkey>>32),(uint32_t)(outkey&0xFFFFFFFF),(long double)t1);
+	fclose(fout);
+	return isSuccess;
+}
+
+int tryMfk64_ex(uint8_t *data, uint64_t *outputkey){
+	uint32_t uid    = le32toh(data);
+	uint32_t nt     = le32toh(data+4);  // tag challenge
+	uint32_t nr_enc = le32toh(data+8);  // encrypted reader challenge
+	uint32_t ar_enc = le32toh(data+12); // encrypted reader response	
+	uint32_t at_enc = le32toh(data+16);	// encrypted tag response
+	return tryMfk64(uid, nt, nr_enc, ar_enc, at_enc, outputkey);
+}
+
+int tryMfk64(uint32_t uid, uint32_t nt, uint32_t nr_enc, uint32_t ar_enc, uint32_t at_enc, uint64_t *outputkey){
+	uint64_t key 	= 0;				// recovered key
+	uint32_t ks2;     					// keystream used to encrypt reader response
+	uint32_t ks3;     					// keystream used to encrypt tag response
+	struct Crypto1State *revstate;
+	
+	PrintAndLog("Enter mfkey64");
+	clock_t t1 = clock();
+	
+	// Extract the keystream from the messages
+	ks2 = ar_enc ^ prng_successor(nt, 64);
+	ks3 = at_enc ^ prng_successor(nt, 96);
+	revstate = lfsr_recovery64(ks2, ks3);
+	lfsr_rollback_word(revstate, 0, 0);
+	lfsr_rollback_word(revstate, 0, 0);
+	lfsr_rollback_word(revstate, nr_enc, 1);
+	lfsr_rollback_word(revstate, uid ^ nt, 0);
+	crypto1_get_lfsr(revstate, &key);
+	PrintAndLog("Found Key: [%012"llx"]", key);
+	crypto1_destroy(revstate);
+	*outputkey = key;
+	
+	t1 = clock() - t1;
+	if ( t1 > 0 ) PrintAndLog("Time in mfkey64: %.0f ticks \n", (float)t1);
 	return 0;
 }
+