X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/480e2f239421563263d07f6d11f2c929d7f14d1f..5e1de05ab0119304b78f810e09e6407ebe1a32ca:/client/nonce2key/crapto1.h?ds=sidebyside diff --git a/client/nonce2key/crapto1.h b/client/nonce2key/crapto1.h index 57102712..1cbebe5d 100644 --- a/client/nonce2key/crapto1.h +++ b/client/nonce2key/crapto1.h @@ -19,8 +19,10 @@ */ #ifndef CRAPTO1_H__ #define CRAPTO1_H__ + #include #include "bucketsort.h" + #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]); +// 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); @@ -82,7 +88,6 @@ static inline int parity(uint32_t x) 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;