X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/cd91e41cb53263b0354aded7b5f6008e6f774ce6..39d43ccc21f7c700010beb3f79773abbe13870a3:/client/nonce2key/nonce2key.c

diff --git a/client/nonce2key/nonce2key.c b/client/nonce2key/nonce2key.c
index 87f66fd6..ab97f597 100644
--- a/client/nonce2key/nonce2key.c
+++ b/client/nonce2key/nonce2key.c
@@ -10,9 +10,6 @@
 // MIFARE Darkside hack
 //-----------------------------------------------------------------------------
 #include "nonce2key.h"
-#include "mifarehost.h"
-#include "ui.h"
-#include "proxmark3.h"
 
 int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_t ks_info, uint64_t * key) {
 	struct Crypto1State *state;
@@ -48,7 +45,7 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
 	clock_t t1 = clock();
 
 	state = lfsr_common_prefix(nr, rr, ks3x, par);
-	lfsr_rollback_word(state, uid^nt, 0);
+	lfsr_rollback_word(state, uid ^ nt, 0);
 	crypto1_get_lfsr(state, key);
 	crypto1_destroy(state);
 
@@ -57,22 +54,32 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
 	return 0;
 }
 
-// call when PAR == 0,  special attack?
-int nonce2key_ex(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t ks_info, uint64_t * key) {
+// call when PAR == 0,  special attack?  It seems to need two calls.  with same uid, block, keytype
+int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, uint32_t nr, uint64_t ks_info, uint64_t * key) {
+
 	struct Crypto1State *state;
 	uint32_t i, pos, key_count;
 	byte_t ks3x[8];
 
 	uint64_t key_recovered;
+
 	int64_t *state_s;
+	static uint8_t last_blockno;
+	static uint8_t last_keytype;
 	static uint32_t last_uid;
 	static int64_t *last_keylist;
-
-	if (last_uid != uid && last_keylist != NULL) {
+  
+	if (last_uid != uid &&
+		last_blockno != blockno &&
+		last_keytype != keytype &&
+		last_keylist != NULL)
+	{
 		free(last_keylist);
 		last_keylist = NULL;
 	}
 	last_uid = uid;
+	last_blockno = blockno;
+	last_keytype = keytype;
 
 	// Reset the last three significant bits of the reader nonce
 	nr &= 0xffffff1f;
@@ -83,24 +90,16 @@ int nonce2key_ex(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t ks_info, uint6
 		ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f;
 	}
   
-	PrintAndLog("parity is all zero,try special attack! just wait for few more seconds");
-
-	clock_t t1 = clock();
+  	PrintAndLog("parity is all zero, try special attack. Just wait for few more seconds...");
 	
 	state = lfsr_common_prefix_ex(nr, ks3x);
 	state_s = (int64_t*)state;
 	
-	//char filename[50] ;
-    //sprintf(filename, "nt_%08x_%d.txt", nt, nr);
-    //printf("name %s\n", filename);
-	//FILE* fp = fopen(filename,"w");
 	for (i = 0; (state) && ((state + i)->odd != -1); i++) {
-		lfsr_rollback_word(state+i, uid^nt, 0);
+		lfsr_rollback_word(state + i, uid ^ nt, 0);
 		crypto1_get_lfsr(state + i, &key_recovered);
 		*(state_s + i) = key_recovered;
-		//fprintf(fp, "%012llx\n",key_recovered);
 	}
-	//fclose(fp);
 	
 	if(!state)
 		return 1;
@@ -110,9 +109,11 @@ int nonce2key_ex(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t ks_info, uint6
 	
 	//Create the intersection:
 	if ( last_keylist != NULL) {
+
 		int64_t *p1, *p2, *p3;
 		p1 = p3 = last_keylist; 
 		p2 = state_s;
+		
 		while ( *p1 != -1 && *p2 != -1 ) {
 			if (compar_int(p1, p2) == 0) {
 				printf("p1:%"llx" p2:%"llx" p3:%"llx" key:%012"llx"\n",(uint64_t)(p1-last_keylist),(uint64_t)(p2-state_s),(uint64_t)(p3-last_keylist),*p1);
@@ -124,53 +125,52 @@ int nonce2key_ex(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t ks_info, uint6
 				while (compar_int(p1, p2) == 1) ++p2;
 			}
 		}
-		key_count = p3 - last_keylist;;
+		key_count = p3 - last_keylist;
+		PrintAndLog("one A");
 	} else {
 		key_count = 0;
+		PrintAndLog("one B");
 	}
 
 	printf("key_count:%d\n", key_count);
 	
 	// The list may still contain several key candidates. Test each of them with mfCheckKeys
-	uint8_t keyBlock[6];
+	uint8_t keyBlock[6] = {0,0,0,0,0,0};
 	uint64_t key64;
 	for (i = 0; i < key_count; i++) {
 		key64 = *(last_keylist + i);
 		num_to_bytes(key64, 6, keyBlock);
 		key64 = 0;
-		if (!mfCheckKeys(0, 0, TRUE, 1, keyBlock, &key64)) {  //block 0,A,
+		if (!mfCheckKeys(blockno, keytype, false, 1, keyBlock, &key64)) {
 			*key = key64;
 			free(last_keylist);
 			last_keylist = NULL;
 			free(state);
 			return 0;
 		}
-	}
-
-	t1 = clock() - t1;
-	if ( t1 > 0 ) PrintAndLog("Time in nonce2key_special: %.0f ticks \n", (float)t1);
-
+	}	
+	
 	free(last_keylist);
 	last_keylist = state_s;
 	return 1;
 }
 
-int tryMfk32(uint8_t *data, uint64_t *outputkey ){
+// 32 bit recover key from 2 nonces
+bool tryMfk32(nonces_t data, uint64_t *outputkey) {
 	struct Crypto1State *s,*t;
-	uint64_t key;						 // recovered key
-	uint32_t uid     = le32toh(data);
-	uint32_t nt      = le32toh(data+4);  // tag challenge
-	uint32_t nr0_enc = le32toh(data+8);  // first encrypted reader challenge
-	uint32_t ar0_enc = le32toh(data+12); // first encrypted reader response
-	//+16 uid2
-	//+20 nt2
-	uint32_t nr1_enc = le32toh(data+24); // second encrypted reader challenge
-	uint32_t ar1_enc = le32toh(data+28); // second encrypted reader response	
+	uint64_t outkey = 0;
+	uint64_t key=0;     // recovered key
+	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;
-	int counter = 0;
+	uint8_t counter = 0;
+
 
-	PrintAndLog("Enter mfkey32");
-	clock_t t1 = clock();
 	s = lfsr_recovery32(ar0_enc ^ prng_successor(nt, 64), 0);
   
 	for(t = s; t->odd | t->even; ++t) {
@@ -181,35 +181,36 @@ int tryMfk32(uint8_t *data, uint64_t *outputkey ){
 		crypto1_word(t, uid ^ nt, 0);
 		crypto1_word(t, nr1_enc, 1);
 		if (ar1_enc == (crypto1_word(t, 0, 0) ^ prng_successor(nt, 64))) {
-			PrintAndLog("Found Key: [%012"llx"]", key);
-			isSuccess = TRUE;
+			//PrintAndLog("Found Key: [%012"llx"]", key);
+			outkey = key;
 			++counter;
-			if (counter==100)
-				break;
+			if (counter==20) break;
 		}
 	}
+ 	isSuccess = (counter > 0);
 	t1 = clock() - t1;
-	if ( t1 > 0 ) PrintAndLog("Time in mf32key: %.0f ticks \n", (float)t1);
-	*outputkey = ( isSuccess ) ? key : 0;
+	if ( t1 > 0 ) PrintAndLog("Time in mfkey32: %.0f ticks  - possible keys %d\n", (float)t1, counter);
+	*outputkey = ( isSuccess ) ? outkey : 0;
 	crypto1_destroy(s);
 	return isSuccess;
 }
 
-int tryMfk32_moebius(uint8_t *data, uint64_t *outputkey ){
+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     = le32toh(data);
-	uint32_t nt0     = le32toh(data+4);  // first tag challenge (nonce)
-	uint32_t nr0_enc = le32toh(data+8);  // first encrypted reader challenge
-	uint32_t ar0_enc = le32toh(data+12); // first encrypted reader response
+	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     = le32toh(data+20); // second tag challenge (nonce)
-	uint32_t nr1_enc = le32toh(data+24); // second encrypted reader challenge
-	uint32_t ar1_enc = le32toh(data+28); // second encrypted reader response	
+	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");
+	//PrintAndLog("Enter mfkey32_moebius");
 	clock_t t1 = clock();
 
 	s = lfsr_recovery32(ar0_enc ^ prng_successor(nt0, 64), 0);
@@ -223,16 +224,16 @@ int tryMfk32_moebius(uint8_t *data, uint64_t *outputkey ){
 		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);
-			isSuccess = TRUE;
+			//PrintAndLog("Found Key: [%012"llx"]",key);
+			outkey=key;
 			++counter;
-			if (counter==20)
-				break;
+			if (counter==20) break;
 		}
 	}
+    isSuccess	= (counter > 0);
 	t1 = clock() - t1;
-	if ( t1 > 0 ) PrintAndLog("Time in mfkey32_moebius: %.0f ticks \n", (float)t1);
-	*outputkey = ( isSuccess ) ? key : 0;
+	if ( t1 > 0 ) PrintAndLog("Time in mfkey32_moebius: %.0f ticks  - possible keys %d\n", (float)t1, counter);
+	*outputkey = ( isSuccess ) ? outkey : 0;
 	crypto1_destroy(s);
 	return isSuccess;
 }