X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/31cf80487727e43b6a7e75416a4a1c25d2c4dc8c..9c6000a0650e066a6d46e231e7fec98d99660990:/client/nonce2key/nonce2key.c

diff --git a/client/nonce2key/nonce2key.c b/client/nonce2key/nonce2key.c
index ab97f597..95c4cf5f 100644
--- a/client/nonce2key/nonce2key.c
+++ b/client/nonce2key/nonce2key.c
@@ -19,7 +19,7 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
 	// Reset the last three significant bits of the reader nonce
 	nr &= 0xffffff1f;
   
-	PrintAndLog("uid(%08x) nt(%08x) par(%016"llx") ks(%016"llx") nr(%08"llx")\n", uid, nt, par_info, ks_info, nr);
+	PrintAndLog("uid(%08x) nt(%08x) par(%016"llx") ks(%016"llx") nr(%08x)\n", uid, nt, par_info, ks_info, nr);
 
 	for ( pos = 0; pos < 8; pos++ ) {
 		ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f;
@@ -84,7 +84,7 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui
 	// Reset the last three significant bits of the reader nonce
 	nr &= 0xffffff1f;
 
-	PrintAndLog("uid(%08x) nt(%08x) ks(%016"llx") nr(%08"llx")\n", uid, nt, ks_info, nr);
+	PrintAndLog("uid(%08x) nt(%08x) ks(%016"llx") nr(%08x)\n", uid, nt, ks_info, nr);
  
 	for (pos=0; pos<8; pos++) {
 		ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f;
@@ -156,7 +156,7 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui
 }
 
 // 32 bit recover key from 2 nonces
-bool tryMfk32(nonces_t data, uint64_t *outputkey) {
+bool tryMfk32(nonces_t data, uint64_t *outputkey, bool verbose) {
 	struct Crypto1State *s,*t;
 	uint64_t outkey = 0;
 	uint64_t key=0;     // recovered key
@@ -166,12 +166,26 @@ bool tryMfk32(nonces_t data, uint64_t *outputkey) {
 	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;
-
-
-	s = lfsr_recovery32(ar0_enc ^ prng_successor(nt, 64), 0);
+	
+	clock_t t1 = clock();
+	uint32_t p64 = prng_successor(nt, 64);
+		
+	if ( verbose ) {
+		printf("Recovering key for:\n");
+		printf("    uid: %08x\n",uid);
+		printf("     nt: %08x\n",nt);
+		printf(" {nr_0}: %08x\n",nr0_enc);
+		printf(" {ar_0}: %08x\n",ar0_enc);
+		printf(" {nr_1}: %08x\n",nr1_enc);
+		printf(" {ar_1}: %08x\n",ar1_enc);
+		printf("\nLFSR succesors of the tag challenge:\n");
+		printf("  nt': %08x\n", p64);
+		printf(" nt'': %08x\n", prng_successor(p64, 32));
+	}
+	
+	s = lfsr_recovery32(ar0_enc ^ p64, 0);
   
 	for(t = s; t->odd | t->even; ++t) {
 		lfsr_rollback_word(t, 0, 0);
@@ -180,8 +194,7 @@ bool tryMfk32(nonces_t data, uint64_t *outputkey) {
 		crypto1_get_lfsr(t, &key);
 		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);
+		if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64)) {
 			outkey = key;
 			++counter;
 			if (counter==20) break;
@@ -190,12 +203,13 @@ bool tryMfk32(nonces_t data, uint64_t *outputkey) {
  	isSuccess = (counter > 0);
 	t1 = clock() - t1;
 	if ( t1 > 0 ) PrintAndLog("Time in mfkey32: %.0f ticks  - possible keys %d\n", (float)t1, counter);
-	*outputkey = ( isSuccess ) ? outkey : 0;
+
+	*outputkey = ( isSuccess ) ? outkey : 0;	
 	crypto1_destroy(s);
 	return isSuccess;
 }
 
-bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) {
+bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey, bool verbose) {
 	struct Crypto1State *s, *t;
 	uint64_t outkey  = 0;
 	uint64_t key 	 = 0;			     // recovered key
@@ -209,11 +223,27 @@ bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) {
 	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);
+	uint32_t p640 = prng_successor(nt0, 64);
+	uint32_t p641 = prng_successor(nt1, 64);
+	
+	if (verbose) {
+		printf("Recovering key for:\n");
+		printf("    uid: %08x\n", uid);
+		printf("   nt_0: %08x\n", nt0);
+		printf(" {nr_0}: %08x\n", nr0_enc);
+		printf(" {ar_0}: %08x\n", ar0_enc);
+		printf("   nt_1: %08x\n", nt1);
+		printf(" {nr_1}: %08x\n", nr1_enc);
+		printf(" {ar_1}: %08x\n", ar1_enc);
+		printf("\nLFSR succesors of the tag challenge:\n");
+		printf("  nt': %08x\n", p640);
+		printf(" nt'': %08x\n", prng_successor(p640, 32));
+	}
+	
+	s = lfsr_recovery32(ar0_enc ^ p640, 0);
   
 	for(t = s; t->odd | t->even; ++t) {
 		lfsr_rollback_word(t, 0, 0);
@@ -223,8 +253,7 @@ bool tryMfk32_moebius(nonces_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);
+		if (ar1_enc == (crypto1_word(t, 0, 0) ^ p641)) {
 			outkey=key;
 			++counter;
 			if (counter==20) break;
@@ -233,6 +262,7 @@ bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) {
     isSuccess	= (counter > 0);
 	t1 = clock() - t1;
 	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;
@@ -248,9 +278,9 @@ int tryMfk64_ex(uint8_t *data, uint64_t *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
+	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");
@@ -265,11 +295,12 @@ int tryMfk64(uint32_t uid, uint32_t nt, uint32_t nr_enc, uint32_t ar_enc, uint32
 	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);
+
+	*outputkey = key;
+	crypto1_destroy(revstate);
 	return 0;
 }