hf mf sim: Multiple fixes (iceman1001/proxmark3 #45)

[proxmark3-svn] / client / nonce2key / crapto1.h

diff --git a/client/nonce2key/crapto1.h b/client/nonce2key/crapto1.h
index 571027126bd969b6573e818b9b5c79590aa33d8f..1cbebe5d5cce4c8a50e055039bdf6c5db02a1fab 100644 (file)
--- a/client/nonce2key/crapto1.h
+++ b/client/nonce2key/crapto1.h
@@ -19,8 +19,10 @@
 */
 #ifndef CRAPTO1_H__
 #define CRAPTO1_H__
 */
 #ifndef CRAPTO1_H__
 #define CRAPTO1_H__

+

 #include <stdint.h>
 #include "bucketsort.h"
 #include <stdint.h>
 #include "bucketsort.h"

+

 #ifdef __cplusplus
 extern "C" {
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif


@@ -39,6 +41,10 @@ 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]);
 
 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]);
 

+// douvan's no-parity function
+struct Crypto1State* lfsr_common_prefix_ex(uint32_t pfx, uint8_t ks[8]);
+
+

 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);
 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);


@@ -82,7 +88,6 @@ static inline int parity(uint32_t x)
 static inline int filter(uint32_t const x)
 {
        uint32_t f;
 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;
        f  = 0xf22c0 >> (x       & 0xf) & 16;
        f |= 0x6c9c0 >> (x >>  4 & 0xf) &  8;
        f |= 0x3c8b0 >> (x >>  8 & 0xf) &  4;