CHG: lowered the number of bytes collected for T55xxReadBlock. Was 12000 -> 7679

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

diff --git a/tools/nonce2key/crapto1.h b/tools/nonce2key/crapto1.h
index cc49b2e6524ef7739a8ef74dc038ff59db50b130..3eaf88b7273629f62702a720819a11eaf4945e72 100644 (file)
--- a/tools/nonce2key/crapto1.h
+++ b/tools/nonce2key/crapto1.h
@@ -17,8 +17,8 @@
 
     Copyright (C) 2008-2014 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>
 #ifdef __cplusplus
 extern "C" {
 #include <stdint.h>
 #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_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);
 
 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
        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"
                "mov %%ax, %%cx\n"
                "shrl $0x10, %%eax\n"
                "xor %%ax, %%cx\n"