X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/59e933fc3f9c4283436b3b317b38c77db0e5d0a7..31cf80487727e43b6a7e75416a4a1c25d2c4dc8c:/client/nonce2key/nonce2key.c?ds=sidebyside

diff --git a/client/nonce2key/nonce2key.c b/client/nonce2key/nonce2key.c
index 3a902ac5..ab97f597 100644
--- a/client/nonce2key/nonce2key.c
+++ b/client/nonce2key/nonce2key.c
@@ -94,7 +94,6 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui
 	
 	state = lfsr_common_prefix_ex(nr, ks3x);
 	state_s = (int64_t*)state;
-	PrintAndLog("Prefix");
 	
 	for (i = 0; (state) && ((state + i)->odd != -1); i++) {
 		lfsr_rollback_word(state + i, uid ^ nt, 0);
@@ -102,7 +101,6 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui
 		*(state_s + i) = key_recovered;
 	}
 	
-	PrintAndLog("zero");
 	if(!state)
 		return 1;
 	
@@ -116,7 +114,6 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui
 		p1 = p3 = last_keylist; 
 		p2 = state_s;
 		
-		PrintAndLog("one");
 		while ( *p1 != -1 && *p2 != -1 ) {
 			if (compar_int(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);
@@ -128,9 +125,11 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui
 				while (compar_int(p1, p2) == 1) ++p2;
 			}
 		}
-		key_count = p3 - last_keylist;;
+		key_count = p3 - last_keylist;
+		PrintAndLog("one A");
 	} else {
 		key_count = 0;
+		PrintAndLog("one B");
 	}
 
 	printf("key_count:%d\n", key_count);
@@ -138,7 +137,6 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui
 	// The list may still contain several key candidates. Test each of them with mfCheckKeys
 	uint8_t keyBlock[6] = {0,0,0,0,0,0};
 	uint64_t key64;
-	PrintAndLog("two");
 	for (i = 0; i < key_count; i++) {
 		key64 = *(last_keylist + i);
 		num_to_bytes(key64, 6, keyBlock);