X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/838c15a6433b1cf1726aede99fa8dcdc7862473a..7663c35c734d7e75fa24e05936fb1ff60c7df1e6:/tools/mfkey/mfkey32.c

diff --git a/tools/mfkey/mfkey32.c b/tools/mfkey/mfkey32.c
index c122b77b..3872e81d 100755
--- a/tools/mfkey/mfkey32.c
+++ b/tools/mfkey/mfkey32.c
@@ -5,8 +5,6 @@
 #include <stdlib.h>
 #include <time.h>
 
-#define llx PRIx64
-#define lli PRIi64
 int main (int argc, char *argv[]) {
 	struct Crypto1State *s,*t;
 	uint64_t key;     // recovered key
@@ -43,17 +41,18 @@ int main (int argc, char *argv[]) {
 
 	// Generate lfsr succesors of the tag challenge
 	printf("\nLFSR succesors of the tag challenge:\n");
-	printf("  nt': %08x\n",prng_successor(nt, 64));
-	printf(" nt'': %08x\n",prng_successor(nt, 96));
+	uint32_t p64 = prng_successor(nt, 64);
+	printf("  nt': %08x\n", p64);
+	printf(" nt'': %08x\n", prng_successor(p64, 32));
 
 	clock_t t1 = clock();
 		
 	// Extract the keystream from the messages
 	printf("\nKeystream used to generate {ar} and {at}:\n");
-	ks2 = ar0_enc ^ prng_successor(nt, 64);
-	printf("  ks2: %08x\n",ks2);
+	ks2 = ar0_enc ^ p64;
+	printf("  ks2: %08x\n", ks2);
 
-	s = lfsr_recovery32(ar0_enc ^ prng_successor(nt, 64), 0);
+	s = lfsr_recovery32(ar0_enc ^ p64, 0);
   
 	for(t = s; t->odd | t->even; ++t) {
 		lfsr_rollback_word(t, 0, 0);
@@ -62,8 +61,8 @@ int main (int argc, char *argv[]) {
 		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))) {
-			printf("\nFound Key: [%012"llx"]\n\n",key);
+		if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64)) {
+			printf("\nFound Key: [%012" PRIx64 "]\n\n",key);
 			break;}
 	}
 	free(s);