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

diff --git a/client/nonce2key/nonce2key.c b/client/nonce2key/nonce2key.c
index 3750366b..942ef78b 100644
--- a/client/nonce2key/nonce2key.c
+++ b/client/nonce2key/nonce2key.c
@@ -164,14 +164,6 @@ bool mfkey32(nonces_t data, uint64_t *outputkey) {
 	clock_t t1 = clock();
 	bool isSuccess = FALSE;
 	uint8_t counter=0;
-	//PrintAndLog("Enter mfkey32");
-	//PrintAndLog("Trying sector %d, cuid %08x, nt %08x, nr %08x, ar %08x, nr2 %08x, ar2 %08x",data.sector, uid, nt,nr0_enc,ar0_enc,nr1_enc,ar1_enc);
-	// Generate lfsr succesors of the tag challenge
-	//prng_successor(nt, 64);
-	//prng_successor(nt, 96);
-
-	// Extract the keystream from the messages
-	//ks2 = ar0_enc ^ prng_successor(nt, 64);
 
 	s = lfsr_recovery32(ar0_enc ^ prng_successor(nt, 64), 0);
 
@@ -200,7 +192,7 @@ bool mfkey32(nonces_t data, uint64_t *outputkey) {
 		PrintAndLog("Could not create file name stats.txt");
 		return 1;
 	}
-	fprintf(fout, "mfkey32,%d,%d,%s,%04x%08x,%.0Lf\r\n",counter,data.sector,(data.keytype) ? "B" : "A", (uint32_t)(outkey>>32) & 0xFFFF,(uint32_t)(outkey&0xFFFFFFFF),(long double)t1);
+	fprintf(fout, "mfkey32,%d,%08x,%d,%s,%04x%08x,%.0Lf\r\n", counter, data.cuid, data.sector, (data.keytype) ? "B" : "A", (uint32_t)(outkey>>32) & 0xFFFF,(uint32_t)(outkey&0xFFFFFFFF),(long double)t1);
 	fclose(fout);
 	return isSuccess;
 }
@@ -251,7 +243,7 @@ bool tryMfk32_moebius(nonces_t data, uint64_t *outputkey) {
 		PrintAndLog("Could not create file name stats.txt");
 		return 1;
 	}
-	fprintf(fout, "moebius,%d,%d,%s,%04x%08x,%0.Lf\r\n",counter,data.sector, (data.keytype) ? "B" : "A", (uint32_t) (outkey>>32),(uint32_t)(outkey&0xFFFFFFFF),(long double)t1);
+	fprintf(fout, "moebius,%d,%08x,%d,%s,%04x%08x,%0.Lf\r\n", counter, data.cuid, data.sector, (data.keytype) ? "B" : "A", (uint32_t) (outkey>>32),(uint32_t)(outkey&0xFFFFFFFF),(long double)t1);
 	fclose(fout);
 	return isSuccess;
 }