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

diff --git a/client/nonce2key/crapto1.c b/client/nonce2key/crapto1.c
index 13c4c063..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
 
 
@@ -399,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