X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/db25599d7faa310019d325290b9b93a59dd97c1b..9c624f67b3c3041d171abf75d954ba9fa0ae57a4:/tools/mfkey/mfkey32v2.c

diff --git a/tools/mfkey/mfkey32v2.c b/tools/mfkey/mfkey32v2.c
index 7183a547..d220566e 100644
--- a/tools/mfkey/mfkey32v2.c
+++ b/tools/mfkey/mfkey32v2.c
@@ -1,13 +1,10 @@
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
-#define llx PRIx64
-#define lli PRIi64
-
-// Test-file: test2.c
 #include "crapto1.h"
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <time.h>
+ 
 int main (int argc, char *argv[]) {
 	struct Crypto1State *s,*t;
 	uint64_t key;     // recovered key
@@ -21,11 +18,11 @@ int main (int argc, char *argv[]) {
 	uint32_t ks2;     // keystream used to encrypt reader response
 
 	printf("MIFARE Classic key recovery - based 32 bits of keystream  VERSION2\n");
-	printf("Recover key from two 32-bit reader authentication answers only");
+	printf("Recover key from two 32-bit reader authentication answers only\n");
 	printf("This version implements Moebius two different nonce solution (like the supercard)\n\n");
 
 	if (argc < 8) {
-		printf(" syntax: %s <uid> <nt> <{nr_0}> <{ar_0}> <nt1> <{nr_1}> <{ar_1}>\n\n",argv[0]);
+		printf("syntax: %s <uid> <nt> <nr_0> <ar_0> <nt1> <nr_1> <ar_1>\n\n", argv[0]);
 		return 1;
 	}
 
@@ -48,15 +45,20 @@ 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(nt0, 64));
-	printf(" nt'': %08x\n",prng_successor(nt0, 96));
+	uint32_t p64 = prng_successor(nt0, 64);
+	uint32_t p64b = prng_successor(nt1, 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(nt0, 64);
+	ks2 = ar0_enc ^ p64;
 	printf("  ks2: %08x\n",ks2);
 
-	s = lfsr_recovery32(ar0_enc ^ prng_successor(nt0, 64), 0);
+	s = lfsr_recovery32(ar0_enc ^ p64, 0);
+	
   
 	for(t = s; t->odd | t->even; ++t) {
 		lfsr_rollback_word(t, 0, 0);
@@ -66,11 +68,12 @@ int main (int argc, char *argv[]) {
 		
 		crypto1_word(t, uid ^ nt1, 0);
 		crypto1_word(t, nr1_enc, 1);
-		if (ar1_enc == (crypto1_word(t, 0, 0) ^ prng_successor(nt1, 64))) {
-			printf("\nFound Key: [%012"llx"]\n\n",key);
+		if (ar1_enc == (crypto1_word(t, 0, 0) ^ p64b)) {
+			printf("\nFound Key: [%012" PRIx64 "]\n\n",key);
 			break;}
 	}
 	free(s);
-
+	t1 = clock() - t1;
+	if ( t1 > 0 ) printf("Time : %.0f ticks \n", (float)t1 );
 	return 0;
 }