X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/22635d611e68909581f1b5f810acdce98ce3885c..bc7846f4376472abdc9ced23436dfe3b6dd20e7f:/client/nonce2key/nonce2key.c

diff --git a/client/nonce2key/nonce2key.c b/client/nonce2key/nonce2key.c
index 048d2adf..aeaecbe6 100644
--- a/client/nonce2key/nonce2key.c
+++ b/client/nonce2key/nonce2key.c
@@ -170,7 +170,18 @@ bool tryMfk32(nonces_t data, uint64_t *outputkey) {
 	bool isSuccess = FALSE;
 	uint8_t counter = 0;
 
+	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");
 	uint32_t p64 = prng_successor(nt, 64);
+	printf("  nt': %08x\n", p64);
+	printf(" nt'': %08x\n", prng_successor(p64, 32));
 	
 	s = lfsr_recovery32(ar0_enc ^ p64, 0);
   
@@ -197,7 +208,7 @@ bool tryMfk32(nonces_t data, uint64_t *outputkey) {
 	return isSuccess;
 }
 
-bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) {
+bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey, bool showMaths) {
 	struct Crypto1State *s, *t;
 	uint64_t outkey  = 0;
 	uint64_t key 	 = 0;			     // recovered key
@@ -212,12 +223,29 @@ bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) {
 	bool isSuccess = FALSE;
 	int counter = 0;
 	
+	if (showMaths) {
+		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);
+	}
+
 	//PrintAndLog("Enter mfkey32_moebius");
 	clock_t t1 = clock();
 
 	uint32_t p640 = prng_successor(nt0, 64);
 	uint32_t p641 = prng_successor(nt1, 64);
 	
+	if (showMaths) {
+		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) {