X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/fb2d24882e31c4a9915a87e28081c3f7d6f3bea4..7d5169a0e97575732aa971121193a9eb4f8fae57:/client/nonce2key/crapto1.c

diff --git a/client/nonce2key/crapto1.c b/client/nonce2key/crapto1.c
index 1d7441c7..dfad1c40 100644
--- a/client/nonce2key/crapto1.c
+++ b/client/nonce2key/crapto1.c
@@ -21,14 +21,20 @@
 #include <stdlib.h>
 
 #if !defined LOWMEM && defined __GNUC__
-static uint8_t filterlut[1 << 20];
+uint8_t filterlut[1 << 20];
 static void __attribute__((constructor)) fill_lut()
 {
-        uint32_t i;
-        for(i = 0; i < 1 << 20; ++i)
-                filterlut[i] = filter(i);
+	uint32_t x;
+	uint32_t f;
+	for(x = 0; x < 1 << 20; ++x) {
+		f  = 0xf22c0 >> (x       & 0xf) & 16;
+		f |= 0x6c9c0 >> (x >>  4 & 0xf) &  8;
+		f |= 0x3c8b0 >> (x >>  8 & 0xf) &  4;
+		f |= 0x1e458 >> (x >> 12 & 0xf) &  2;
+		f |= 0x0d938 >> (x >> 16 & 0xf) &  1;
+		filterlut[x] = BIT(0xEC57E80A, f);
+	}
 }
-#define filter(x) (filterlut[(x) & 0xfffff])
 #endif
 
 
@@ -251,7 +257,6 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
 			}
 		}
 
-
 	// initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
 	for(i = 1 << 20; i >= 0; --i) {
 		if(filter(i) == (oks & 1))
@@ -272,9 +277,7 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
 
 	in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00);		// Byte swapping
 
-	recover(odd_head, odd_tail, oks,
-		even_head, even_tail, eks, 11, statelist, in << 1, bucket);
-
+	recover(odd_head, odd_tail, oks, even_head, even_tail, eks, 11, statelist, in << 1, bucket);
 
 out:
 	free(odd_head);
@@ -402,18 +405,66 @@ void lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
  */
 void lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
 {
-	int i;
+/*	int i;
 	for (i = 7; i >= 0; --i)
 		lfsr_rollback_bit(s, BEBIT(in, i), fb);
+*/
+// unfold loop 20160112
+	lfsr_rollback_bit(s, BEBIT(in, 7), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 6), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 5), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 4), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 3), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 2), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 1), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 0), fb);
 }
 /** lfsr_rollback_word
  * Rollback the shift register in order to get previous states
  */
 void lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)
 {
+/*
 	int i;
 	for (i = 31; i >= 0; --i)
 		lfsr_rollback_bit(s, BEBIT(in, i), fb);
+*/
+// unfold loop 20160112
+	lfsr_rollback_bit(s, BEBIT(in, 31), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 30), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 29), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 28), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 27), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 26), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 25), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 24), fb);
+
+	lfsr_rollback_bit(s, BEBIT(in, 23), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 22), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 21), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 20), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 19), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 18), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 17), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 16), fb);
+
+	lfsr_rollback_bit(s, BEBIT(in, 15), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 14), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 13), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 12), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 11), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 10), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 9), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 8), fb);
+
+	lfsr_rollback_bit(s, BEBIT(in, 7), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 6), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 5), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 4), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 3), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 2), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 1), fb);
+	lfsr_rollback_bit(s, BEBIT(in, 0), fb);
 }
 
 /** nonce_distance
@@ -536,8 +587,7 @@ brute_top(uint32_t prefix, uint32_t rresp, unsigned char parities[8][8],
  * It returns a zero terminated list of possible cipher states after the
  * tag nonce was fed in
  */
-struct Crypto1State*
-lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8], uint8_t no_par)
+struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8], uint8_t no_par)
 {
 	struct Crypto1State *statelist, *s;
 	uint32_t *odd, *even, *o, *e, top;
@@ -548,10 +598,10 @@ lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8],
 	statelist = malloc((sizeof *statelist) << 21);	//how large should be?
 	if(!statelist || !odd || !even)
 	{
-				free(statelist);
-				free(odd);
-				free(even);
-				return 0;
+		free(statelist);
+		free(odd);
+		free(even);
+		return 0;
 	}
 
 	s = statelist;
@@ -571,3 +621,66 @@ lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8],
 
 	return statelist;
 }
+
+/*
+struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8], uint8_t no_par, uint32_t nt, uint32_t uid)
+{
+    long long int amount = 0;
+    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(odd);
+		free(even);
+		free(statelist);
+		return 0;
+    }
+
+    char filename[50] = "archivo.txt";
+    sprintf(filename, "logs/%x.txt", nt);
+    PrintAndLog("Name: %s\n", filename);
+    FILE *file = fopen(filename,"w+");
+	if ( !file ) {
+		s->odd = s->even = 0;
+		free(odd);
+		free(even);
+		PrintAndLog("Failed to create file");
+		return 0;
+	}
+    PrintAndLog("Creating file... ");
+	uint32_t xored = uid^nt;
+	
+    int lastOdd = 0;
+    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;
+
+                //added by MG
+                if(lastOdd != statelist->odd){
+					// Here I create a temporal crypto1 state, 
+					// where I load the odd and even state and work with it,
+					// in order not to interfere with regular mechanism, This is what I save to file
+					struct Crypto1State *state;
+                    lastOdd = state->odd = statelist->odd; state->even = statelist->even;
+                    lfsr_rollback_word(state,xored,0);
+                    fprintf(file,"%x %x \n",state->odd,state->even);
+                    amount++;
+                }
+                //s = check_pfx_parity(pfx, rr, par, *o, *e, s); //This is not useful at all when attacking chineese cards
+				s = brute_top(pfx, rr, par, *o, *e, s, no_par); 
+            }
+
+	PrintAndLog("File created, amount %u\n",amount);
+	fclose(file);
+	s->odd = s->even = 0;
+	free(odd);
+	free(even);
+    return statelist;
+}
+ */