chg: the windows exe annoys the linux compiler

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

diff --git a/client/nonce2key/crapto1.c b/client/nonce2key/crapto1.c
index 0faeb1d1cdccb124698f393f886b3e9380d5e7a3..919820e9a12e85e05da38ae08eb5ba039909e196 100644 (file)
--- a/client/nonce2key/crapto1.c
+++ b/client/nonce2key/crapto1.c
@@ -31,90 +31,10 @@ static void __attribute__((constructor)) fill_lut()
 #define filter(x) (filterlut[(x) & 0xfffff])\r
 #endif\r
 \r
 #define filter(x) (filterlut[(x) & 0xfffff])\r
 #endif\r
 \r

-\r
-\r
-typedef struct bucket {\r
-       uint32_t *head;\r
-       uint32_t *bp;\r
-} bucket_t;\r
-\r
-typedef bucket_t bucket_array_t[2][0x100];\r
-\r
-typedef struct bucket_info {\r
-       struct {\r
-               uint32_t *head, *tail;\r
-               } bucket_info[2][0x100];\r
-               uint32_t numbuckets;\r
-       } bucket_info_t;\r
-\r
-\r
-static void bucket_sort_intersect(uint32_t* const estart, uint32_t* const estop,\r
-                                                                 uint32_t* const ostart, uint32_t* const ostop,\r
-                                                                 bucket_info_t *bucket_info, bucket_array_t bucket)\r
-{\r
-       uint32_t *p1, *p2;\r
-       uint32_t *start[2];\r
-       uint32_t *stop[2];\r
-\r
-       start[0] = estart;\r
-       stop[0] = estop;\r
-       start[1] = ostart;\r
-       stop[1] = ostop;\r
-\r
-       // init buckets to be empty\r
-       for (uint32_t i = 0; i < 2; i++) {\r
-               for (uint32_t j = 0x00; j <= 0xff; j++) {\r
-                       bucket[i][j].bp = bucket[i][j].head;\r
-               }\r
-       }\r
-\r
-       // sort the lists into the buckets based on the MSB (contribution bits)\r
-       for (uint32_t i = 0; i < 2; i++) {\r
-               for (p1 = start[i]; p1 <= stop[i]; p1++) {\r
-                       uint32_t bucket_index = (*p1 & 0xff000000) >> 24;\r
-                       *(bucket[i][bucket_index].bp++) = *p1;\r
-               }\r
-       }\r
-\r
-\r
-       // write back intersecting buckets as sorted list.\r
-       // fill in bucket_info with head and tail of the bucket contents in the list and number of non-empty buckets.\r
-       uint32_t nonempty_bucket;\r
-       for (uint32_t i = 0; i < 2; i++) {\r
-               p1 = start[i];\r
-               nonempty_bucket = 0;\r
-               for (uint32_t j = 0x00; j <= 0xff; j++) {\r
-                       if (bucket[0][j].bp != bucket[0][j].head && bucket[1][j].bp != bucket[1][j].head) { // non-empty intersecting buckets only\r
-                               bucket_info->bucket_info[i][nonempty_bucket].head = p1;\r
-                               for (p2 = bucket[i][j].head; p2 < bucket[i][j].bp; *p1++ = *p2++);\r
-                               bucket_info->bucket_info[i][nonempty_bucket].tail = p1 - 1;\r
-                               nonempty_bucket++;\r
-                       }\r
-               }\r
-               bucket_info->numbuckets = nonempty_bucket;\r
-               }\r
-}\r
-\r
-/** binsearch\r
- * Binary search for the first occurence of *stop's MSB in sorted [start,stop]\r
- */\r
-static inline uint32_t* binsearch(uint32_t *start, uint32_t *stop)\r
-{\r
-       uint32_t mid, val = *stop & 0xff000000;\r
-       while(start != stop)\r
-               if(start[mid = (stop - start) >> 1] > val)\r
-                       stop = &start[mid];\r
-               else\r
-                       start += mid + 1;\r
-\r
-       return start;\r
-}\r
-\r

 /** update_contribution\r
  * helper, calculates the partial linear feedback contributions and puts in MSB\r
  */\r
 /** update_contribution\r
  * helper, calculates the partial linear feedback contributions and puts in MSB\r
  */\r

-static inline void\r
-update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)\r
+static inline void update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)\r

 {\r
        uint32_t p = *item >> 25;\r
 \r
 {\r
        uint32_t p = *item >> 25;\r
 \r


@@ -126,8 +46,7 @@ update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)
 /** extend_table\r
  * using a bit of the keystream extend the table of possible lfsr states\r
  */\r
 /** extend_table\r
  * using a bit of the keystream extend the table of possible lfsr states\r
  */\r

-static inline void\r
-extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)\r
+static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)\r

 {\r
        in <<= 24;\r
        for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)\r
 {\r
        in <<= 24;\r
        for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)\r


@@ -150,14 +69,16 @@ extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in
  */\r
 static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)\r
 {\r
  */\r
 static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)\r
 {\r

-       for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)\r
+       for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {\r

                if(filter(*tbl) ^ filter(*tbl | 1)) {   // replace\r
                        *tbl |= filter(*tbl) ^ bit;\r
                } else if(filter(*tbl) == bit) {                // insert\r
                        *++*end = *++tbl;\r
                        *tbl = tbl[-1] | 1;\r
                if(filter(*tbl) ^ filter(*tbl | 1)) {   // replace\r
                        *tbl |= filter(*tbl) ^ bit;\r
                } else if(filter(*tbl) == bit) {                // insert\r
                        *++*end = *++tbl;\r
                        *tbl = tbl[-1] | 1;\r

-               } else                                                                  // drop\r
+               } else  {                                                               // drop\r

                        *tbl-- = *(*end)--;\r
                        *tbl-- = *(*end)--;\r

+               }\r
+       }\r

 }\r
 /** recover\r
  * recursively narrow down the search space, 4 bits of keystream at a time\r
 }\r
 /** recover\r
  * recursively narrow down the search space, 4 bits of keystream at a time\r


@@ -186,13 +107,11 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
                oks >>= 1;\r
                eks >>= 1;\r
                in >>= 2;\r
                oks >>= 1;\r
                eks >>= 1;\r
                in >>= 2;\r

-               extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1,\r
-                            LF_POLY_ODD << 1, 0);\r
+               extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1, LF_POLY_ODD << 1, 0);\r

                if(o_head > o_tail)\r
                        return sl;\r
 \r
                if(o_head > o_tail)\r
                        return sl;\r
 \r

-               extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD,\r
-                            LF_POLY_EVEN << 1 | 1, in & 3);\r
+               extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD, LF_POLY_EVEN << 1 | 1, in & 3);\r

                if(e_head > e_tail)\r
                        return sl;\r
        }\r
                if(e_head > e_tail)\r
                        return sl;\r
        }\r


@@ -238,14 +157,15 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
 \r
        // allocate memory for out of place bucket_sort\r
        bucket_array_t bucket;\r
 \r
        // allocate memory for out of place bucket_sort\r
        bucket_array_t bucket;\r

-       for (uint32_t i = 0; i < 2; i++)\r
+       \r
+       for (uint32_t i = 0; i < 2; i++) {\r

                for (uint32_t j = 0; j <= 0xff; j++) {\r
                        bucket[i][j].head = malloc(sizeof(uint32_t)<<14);\r
                        if (!bucket[i][j].head) {\r
                for (uint32_t j = 0; j <= 0xff; j++) {\r
                        bucket[i][j].head = malloc(sizeof(uint32_t)<<14);\r
                        if (!bucket[i][j].head) {\r

-                               goto out;\r
+                                goto out;\r

                        }\r
                }\r
                        }\r
                }\r

-\r
+       }\r

 \r
        // initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream\r
        for(i = 1 << 20; i >= 0; --i) {\r
 \r
        // initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream\r
        for(i = 1 << 20; i >= 0; --i) {\r


@@ -265,17 +185,14 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
        // 22 bits to go to recover 32 bits in total. From now on, we need to take the "in"\r
        // parameter into account.\r
        in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00);            // Byte swapping\r
        // 22 bits to go to recover 32 bits in total. From now on, we need to take the "in"\r
        // parameter into account.\r
        in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00);            // Byte swapping\r

-       recover(odd_head, odd_tail, oks,\r
-               even_head, even_tail, eks, 11, statelist, in << 1, bucket);\r
-\r
+       recover(odd_head, odd_tail, oks, even_head, even_tail, eks, 11, statelist, in << 1, bucket);\r

 \r
 out:\r
        free(odd_head);\r
        free(even_head);\r
 \r
 out:\r
        free(odd_head);\r
        free(even_head);\r

-       for (uint32_t i = 0; i < 2; i++)\r
-               for (uint32_t j = 0; j <= 0xff; j++)\r
+       for (uint8_t i = 0; i < 2; i++)\r
+               for (uint8_t j = 0; j <= 0xff; j++)\r

                        free(bucket[i][j].head);\r
                        free(bucket[i][j].head);\r

-\r

        return statelist;\r
 }\r
 \r
        return statelist;\r
 }\r
 \r