X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/cb64309e4b187ada12e66c1a782f243b7924d32f..0062cc1ca1d5a166a623f6a468c9901e214e3744:/client/nonce2key/crapto1.h

diff --git a/client/nonce2key/crapto1.h b/client/nonce2key/crapto1.h
index 67af4642..1cbebe5d 100644
--- a/client/nonce2key/crapto1.h
+++ b/client/nonce2key/crapto1.h
@@ -15,11 +15,14 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     MA  02110-1301, US$
 
-    Copyright (C) 2008-2008 bla <blapost@gmail.com>
+    Copyright (C) 2008-2014 bla <blapost@gmail.com>
 */
-#ifndef CRAPTO1_INCLUDED
-#define CRAPTO1_INCLUDED
+#ifndef CRAPTO1_H__
+#define CRAPTO1_H__
+
 #include <stdint.h>
+#include "bucketsort.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -36,17 +39,19 @@ uint32_t prng_successor(uint32_t x, uint32_t n);
 struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in);
 struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3);
 uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd);
-struct Crypto1State*
-lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8]);
+struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8]);
+
+// douvan's no-parity function
+struct Crypto1State* lfsr_common_prefix_ex(uint32_t pfx, uint8_t ks[8]);
 
 
-void lfsr_rollback_bit(struct Crypto1State* s, uint32_t in, int fb);
-void lfsr_rollback_byte(struct Crypto1State* s, uint32_t in, int fb);
-void lfsr_rollback_word(struct Crypto1State* s, uint32_t in, int fb);
+uint8_t lfsr_rollback_bit(struct Crypto1State* s, uint32_t in, int fb);
+uint8_t lfsr_rollback_byte(struct Crypto1State* s, uint32_t in, int fb);
+uint32_t lfsr_rollback_word(struct Crypto1State* s, uint32_t in, int fb);
 int nonce_distance(uint32_t from, uint32_t to);
 #define SWAPENDIAN(x)\
 	(x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
-
+	
 #define FOREACH_VALID_NONCE(N, FILTER, FSIZE)\
 	uint32_t __n = 0,__M = 0, N = 0;\
 	int __i;\
@@ -70,20 +75,19 @@ static inline int parity(uint32_t x)
 	x ^= x >> 4;
 	return BIT(0x6996, x & 0xf);
 #else
-        __asm(    "movl %1, %%eax\n"
-		"mov %%ax, %%cx\n"
-		"shrl $0x10, %%eax\n"
-		"xor %%ax, %%cx\n"
-                "xor %%ch, %%cl\n"
-                "setpo %%al\n"
-                "movzx %%al, %0\n": "=r"(x) : "r"(x): "eax","ecx");
+        __asm__(    "movl %1, %%eax\n"
+			"mov %%ax, %%cx\n"
+			"shrl $0x10, %%eax\n"
+			"xor %%ax, %%cx\n"
+			"xor %%ch, %%cl\n"
+			"setpo %%al\n"
+			"movzx %%al, %0\n": "=r"(x) : "r"(x): "eax","ecx");
 	return x;
 #endif
 }
 static inline int filter(uint32_t const x)
 {
 	uint32_t f;
-
 	f  = 0xf22c0 >> (x       & 0xf) & 16;
 	f |= 0x6c9c0 >> (x >>  4 & 0xf) &  8;
 	f |= 0x3c8b0 >> (x >>  8 & 0xf) &  4;