static uint8_t filterlut[1 << 20];\r
static void __attribute__((constructor)) fill_lut()\r
{\r
- uint32_t i;\r
- for(i = 0; i < 1 << 20; ++i)\r
- filterlut[i] = filter(i);\r
+ uint32_t i;\r
+ for(i = 0; i < 1 << 20; ++i)\r
+ filterlut[i] = filter(i);\r
}\r
#define filter(x) (filterlut[(x) & 0xfffff])\r
#endif\r
\r
-static void quicksort(uint32_t* const start, uint32_t* const stop)\r
-{\r
- uint32_t *it = start + 1, *rit = stop, t;\r
-\r
- if(it > rit)\r
- return;\r
-\r
- while(it < rit)\r
- if(*it <= *start)\r
- ++it;\r
- else if(*rit > *start)\r
- --rit;\r
- else\r
- t = *it, *it = *rit, *rit = t;\r
-\r
- if(*rit >= *start)\r
- --rit;\r
- if(rit != start)\r
- t = *rit, *rit = *start, *start = t;\r
-\r
- quicksort(start, rit - 1);\r
- quicksort(rit + 1, stop);\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
-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
/** 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
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
- } else // drop\r
+ } else { // drop\r
*tbl-- = *(*end)--;\r
+ }\r
+ }\r
}\r
-\r
-\r
/** recover\r
* recursively narrow down the search space, 4 bits of keystream at a time\r
*/\r
static struct Crypto1State*\r
recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,\r
uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,\r
- struct Crypto1State *sl, uint32_t in)\r
+ struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)\r
{\r
- uint32_t *o, *e, i;\r
+ uint32_t *o, *e;\r
+ bucket_info_t bucket_info;\r
\r
if(rem == -1) {\r
for(e = e_head; e <= e_tail; ++e) {\r
return sl;\r
}\r
\r
- for(i = 0; i < 4 && rem--; i++) {\r
+ for(uint32_t i = 0; i < 4 && rem--; i++) {\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
- 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
\r
- quicksort(o_head, o_tail);\r
- quicksort(e_head, e_tail);\r
+ bucket_sort_intersect(e_head, e_tail, o_head, o_tail, &bucket_info, bucket);\r
\r
- while(o_tail >= o_head && e_tail >= e_head)\r
- if(((*o_tail ^ *e_tail) >> 24) == 0) {\r
- o_tail = binsearch(o_head, o = o_tail);\r
- e_tail = binsearch(e_head, e = e_tail);\r
- sl = recover(o_tail--, o, oks,\r
- e_tail--, e, eks, rem, sl, in);\r
+ for (int i = bucket_info.numbuckets - 1; i >= 0; i--) {\r
+ sl = recover(bucket_info.bucket_info[1][i].head, bucket_info.bucket_info[1][i].tail, oks,\r
+ bucket_info.bucket_info[0][i].head, bucket_info.bucket_info[0][i].tail, eks,\r
+ rem, sl, in, bucket);\r
}\r
- else if(*o_tail > *e_tail)\r
- o_tail = binsearch(o_head, o_tail) - 1;\r
- else\r
- e_tail = binsearch(e_head, e_tail) - 1;\r
\r
return sl;\r
}\r
\r
statelist->odd = statelist->even = 0;\r
\r
+ // allocate memory for out of place bucket_sort\r
+ bucket_array_t bucket;\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
+ goto out;\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
if(filter(i) == (oks & 1))\r
// the statelists now contain all states which could have generated the last 10 Bits of the keystream.\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);\r
- recover(odd_head, odd_tail, oks,\r
- even_head, even_tail, eks, 11, statelist, in << 1);\r
+ in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00); // Byte swapping\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
+ for (uint8_t i = 0; i < 2; i++)\r
+ for (uint8_t j = 0; j <= 0xff; j++)\r
+ free(bucket[i][j].head);\r
return statelist;\r
}\r
\r
projects / proxmark3-svn / blobdiff