X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/aacb96d7ed1723663fddd4e2611c22c971442cbd..cd777a0545066d87b1e0f838cdee0604941919d7:/client/nonce2key/crapto1.c

diff --git a/client/nonce2key/crapto1.c b/client/nonce2key/crapto1.c
index 626823f8..c17cea7a 100644
--- a/client/nonce2key/crapto1.c
+++ b/client/nonce2key/crapto1.c
@@ -26,7 +26,7 @@ static void __attribute__((constructor)) fill_lut()
 {
 	uint32_t i;
 	for(i = 0; i < 1 << 20; ++i)
-			filterlut[i] = filter(i);
+		filterlut[i] = filter(i);
 }
 #define filter(x) (filterlut[(x) & 0xfffff])
 #endif
@@ -196,7 +196,7 @@ out:
 	return statelist;
 }
 
-static const uint32_t S1[] = {     0x62141, 0x310A0, 0x18850, 0x0C428, 0x06214,
+static const uint32_t S1[] = { 0x62141, 0x310A0, 0x18850, 0x0C428, 0x06214,
 	0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
 	0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA};
 static const uint32_t S2[] = {  0x3A557B00, 0x5D2ABD80, 0x2E955EC0, 0x174AAF60,
@@ -383,7 +383,7 @@ uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
 /** nonce_distance
  * x,y valid tag nonces, then prng_successor(x, nonce_distance(x, y)) = y
  */
-static uint16_t *dist = 0;
+static uint16_t *dist;
 int nonce_distance(uint32_t from, uint32_t to)
 {
 	uint16_t x, i;
@@ -391,7 +391,7 @@ int nonce_distance(uint32_t from, uint32_t to)
 		dist = malloc(2 << 16);
 		if(!dist)
 			return -1;
-		for (x = i = 1; i; ++i) {
+		for (x = 1, i = 1; i; ++i) {
 			dist[(x & 0xff) << 8 | x >> 8] = i;
 			x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;
 		}
@@ -467,6 +467,24 @@ static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, ui
 
 	return sl + good;
 }
+static struct Crypto1State* check_pfx_parity_ex(uint32_t prefix, uint32_t odd, uint32_t even, struct Crypto1State* sl) {
+	struct Crypto1State s;
+	uint32_t c = 0;
+
+	s.odd = odd ^ fastfwd[1][c];
+	s.even = even ^ fastfwd[0][c];
+	
+	lfsr_rollback_bit(&s, 0, 0);
+	lfsr_rollback_bit(&s, 0, 0);
+	lfsr_rollback_bit(&s, 0, 0);
+	
+	lfsr_rollback_word(&s, 0, 0);
+	lfsr_rollback_word(&s, prefix | c << 5, 1);
+	
+	sl->odd = s.odd;
+	sl->even = s.even;
+	return ++sl;
+}
 
 /** lfsr_common_prefix
  * Implentation of the common prefix attack.
@@ -490,7 +508,7 @@ struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8]
 	if(!s || !odd || !even) {
 		free(statelist);
 		statelist = 0;
-                goto out;
+		goto out;
 	}
 
 	for(o = odd; *o + 1; ++o)
@@ -507,3 +525,40 @@ out:
 	free(even);
 	return statelist;
 }
+
+struct Crypto1State* lfsr_common_prefix_ex(uint32_t pfx, uint8_t ks[8])
+{
+	struct Crypto1State *statelist, *s;
+	uint32_t *odd, *even, *o, *e, top;
+
+	odd = lfsr_prefix_ks(ks, 1);
+	even = lfsr_prefix_ks(ks, 0);
+
+	s = statelist = malloc((sizeof *statelist) << 20);
+	if(!s || !odd || !even) {
+		free(statelist);
+		statelist = 0;
+		goto out;
+	}
+
+	// for(o = odd; *o + 1; ++o)
+		// for(e = even; *e + 1; ++e)
+			// for(top = 0; top < 64; ++top) {
+				// *o += 1 << 21;
+				// *e += (!(top & 7) + 1) << 21;
+				// s = check_pfx_parity_ex(pfx, *o, *e, s);
+			// }
+	for(o = odd; *o != -1; ++o)
+		for(e = even; *e != -1; ++e)
+			for(top = 0; top < 64; ++top) {
+				*o = (*o & 0x1fffff) | (top << 21);
+				*e = (*e & 0x1fffff) | (top >> 3) << 21;
+				s = check_pfx_parity_ex(pfx, *o, *e, s);
+			}
+
+	s->odd = s->even = -1;	
+out:
+	free(odd);
+	free(even);
+	return statelist;
+}