X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a1afa550ea5b602b6d8bc69bdc6f018696b21ff0..70441e77981258adf8b45a660cf5ea71729381aa:/tools/nonce2key/crapto1.h diff --git a/tools/nonce2key/crapto1.h b/tools/nonce2key/crapto1.h index cc49b2e6..3eaf88b7 100644 --- a/tools/nonce2key/crapto1.h +++ b/tools/nonce2key/crapto1.h @@ -17,8 +17,8 @@ Copyright (C) 2008-2014 bla */ -#ifndef CRAPTO1_INCLUDED -#define CRAPTO1_INCLUDED +#ifndef CRAPTO1_H__ +#define CRAPTO1_H__ #include #ifdef __cplusplus extern "C" { @@ -37,8 +37,6 @@ 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_ex(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][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); @@ -70,7 +68,7 @@ static inline int parity(uint32_t x) x ^= x >> 4; return BIT(0x6996, x & 0xf); #else - __asm__( "movl %1, %%eax\n" + __asm__( "movl %1, %%eax\n" "mov %%ax, %%cx\n" "shrl $0x10, %%eax\n" "xor %%ax, %%cx\n"