X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/417f4ae12711f28d8b27dcd29786a1cc9300aaad..4460be68c36b9545a493d4e4479cd0bb14a576cd:/armsrc/crapto1.h?ds=sidebyside diff --git a/armsrc/crapto1.h b/armsrc/crapto1.h index 50654db9..54d66c28 100644 --- a/armsrc/crapto1.h +++ b/armsrc/crapto1.h @@ -32,12 +32,12 @@ uint8_t crypto1_bit(struct Crypto1State*, uint8_t, int); uint8_t crypto1_byte(struct Crypto1State*, uint8_t, int); uint32_t crypto1_word(struct Crypto1State*, uint32_t, int); uint32_t prng_successor(uint32_t x, uint32_t n); +uint32_t prng_successor_one(uint32_t x); 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]); 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); @@ -69,10 +69,10 @@ 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" + __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");