X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/d1057e7a2105d5e2696df185482176f22a5bd669..33443e7caa26da1563402d548e0a871d53ccc23a:/client/nonce2key/nonce2key.c

diff --git a/client/nonce2key/nonce2key.c b/client/nonce2key/nonce2key.c
index 5647c424..68cd1cd9 100644
--- a/client/nonce2key/nonce2key.c
+++ b/client/nonce2key/nonce2key.c
@@ -10,13 +10,14 @@
 // MIFARE Darkside hack
 //-----------------------------------------------------------------------------
 
-#define __STDC_FORMAT_MACROS
 #include <inttypes.h>
-#define llx PRIx64
+#include <time.h>
 
 #include "nonce2key.h"
 #include "mifarehost.h"
 #include "ui.h"
+#include "util.h"
+#include "crapto1/crapto1.h"
 
 int compar_state(const void * a, const void * b) {
 	// didn't work: (the result is truncated to 32 bits)
@@ -31,7 +32,7 @@ int compar_state(const void * a, const void * b) {
 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;
   uint32_t i, pos, rr, nr_diff, key_count;//, ks1, ks2;
-  byte_t bt, ks3x[8], par[8][8];
+  uint8_t bt, ks3x[8], par[8][8];
   uint64_t key_recovered;
   int64_t *state_s;
   static uint32_t last_uid;
@@ -48,7 +49,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("\nuid(%08x) nt(%08x) par(%016"llx") ks(%016"llx") nr(%08"llx")\n\n",uid,nt,par_info,ks_info,nr);
+  PrintAndLog("\nuid(%08x) nt(%08x) par(%016" PRIx64") ks(%016" PRIx64") nr(%08" PRIx32")\n\n",uid,nt,par_info,ks_info,nr);
 
   for (pos=0; pos<8; pos++)
   {
@@ -74,7 +75,7 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
 	if (par_info==0)
 		PrintAndLog("parity is all zero,try special attack!just wait for few more seconds...");
   
-	state = lfsr_common_prefix(nr, rr, ks3x, par, par_info==0);
+	state = lfsr_common_prefix(nr, rr, ks3x, par);
 	state_s = (int64_t*)state;
 	
 	//char filename[50] ;
@@ -86,7 +87,7 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
 		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);
+		//fprintf(fp, "%012" PRIx64 "\n",key_recovered);
 	}
 	//fclose(fp);
 	
@@ -105,7 +106,7 @@ int nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_
 			p2 = state_s;
 			while ( *p1 != -1 && *p2 != -1 ) {
 				if (compar_state(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);
+					printf("p1:%" PRIx64" p2:%" PRIx64 " p3:%" PRIx64" key:%012" PRIx64 "\n",(uint64_t)(p1-last_keylist),(uint64_t)(p2-state_s),(uint64_t)(p3-last_keylist),*p1);
 					*p3++ = *p1++;
 					p2++;
 				}
@@ -162,7 +163,7 @@ bool mfkey32(nonces_t data, uint64_t *outputkey) {
 	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;
+	bool isSuccess = false;
 	uint8_t counter=0;
 
 	s = lfsr_recovery32(ar0_enc ^ prng_successor(nt, 64), 0);
@@ -175,7 +176,7 @@ bool mfkey32(nonces_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);
+			//PrintAndLog("Found Key: [%012" PRIx64 "]",key);
 			outkey = key;
 			counter++;
 			if (counter==20) break;
@@ -209,7 +210,7 @@ bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) {
 	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;
+	bool isSuccess = false;
 	int counter = 0;
 	
 	//PrintAndLog("Enter mfkey32_moebius");
@@ -226,7 +227,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);
+			//PrintAndLog("Found Key: [%012" PRIx64 "]",key);
 			outkey=key;
 			++counter;
 			if (counter==20)
@@ -277,7 +278,7 @@ 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);
+	PrintAndLog("Found Key: [%012" PRIx64 "]", key);
 	crypto1_destroy(revstate);
 	*outputkey = key;